easycomments 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3769d7478cdda520b182646690a420544f484241
-  data.tar.gz: 741d5355bf84ff27c09c3ef9f672a25e9472d24a
+  metadata.gz: 1dcc9d3104da94075bb4659a6a8f1a307f001e90
+  data.tar.gz: c61f97f06e4fd639b2115c8479cf90e393872b09
 SHA512:
-  metadata.gz: 608099e88c4eac8f4b7b035480fe64d6cb88e94d2aebd59a20fdc80100019ab3656b9ea47dcac7630095f2fb792e6fcc312f9340fee5bcd099d203bc5ebbebba
-  data.tar.gz: 3e91047ba20119846abc20fa345c79f70e558926216519198c4b402d36376d15811299cc6baa55644fc5ce21ced3ed4456b9dccdda13cb61df018f3a22d32f06
+  metadata.gz: 8837509b3294dcc74b2e27d98f431b70b3c972ade6542a96bcdb1775312a4f999cee5a380a31549f84ecc19ffe8364c2118221c14c608ba989130c113cdcd7bf
+  data.tar.gz: da0767ab75667a0c0db7ee0be3a3a716a482a89acb267099e43b792c9eb46ae2834e654d6de75b03a3098d4bcafb32e318bbf2326e7acd8094b6fb9a3078c707

data/.editorconfig

@@ -0,0 +1,18 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+
+indent_style = space
+indent_size = 2
+
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.2.1
+  - 2.2.2
   - 2.1.5
-  - 2.0.0
+  - 2.0.0

data/README.md

@@ -62,6 +62,7 @@ in _config.yml you can change the following
 #database connection url to be passed to sequel's connect method.
 #check http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html
 #all adapters supported by sequel can be used
+#you can also use an enviroment variable formatted as ENV["variable"] or just "variable" holding your db's url
 connection: "sqlite://blog.db"
 
 #set to true to allow all coments to be posted without moderation.
@@ -113,7 +114,7 @@ by hand since it also bcrypts your passwords!
 5. Create new Pull Request
 
 ###Tested with
-* Ruby 2.2.1
+* Ruby 2.2.2
 * Ruby 2.1.5
 * Ruby 2.0.0
 

data/_config.yml

@@ -12,6 +12,7 @@ comments_per_page: 10
 ##connection : database connection url to be passed to sequel's connect method.
 ##check http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html
 ##all adapters supported by sequel can be used
+##you can also use an enviroment variable formatted as ENV["variable"] or just "variable" holding your db's url
 #
 ##approve_by_default : set to true to allow all coments to be posted without moderation.
 #
@@ -24,7 +25,7 @@ comments_per_page: 10
 #
 ##cors_origin : see available formats here https://github.com/cyu/rack-cors
 #
-##auto_escape_html : automatically escape html in comment bodys
+##auto_escape_html : automatically escape html in comment bodies
 #
 ##paginate : set to true to have pagination support in comment retrieval
 #

data/easycomments.gemspec

@@ -1,7 +1,8 @@
 Gem::Specification.new do |s|
   s.name        = 'easycomments'
-  s.version     = '1.0.4'
-  s.date        = '2015-04-03'
+  s.version     = '1.0.5'
+  s.date        = '2015-04-24'
+  s.required_ruby_version = '>= 2.0.0'
   s.summary     = "Simple and easy to use comment system"
   s.description = <<EOF
 EasyComments(EC) is an easy to use comment system with a simple api
@@ -16,4 +17,4 @@ EOF
   s.email = 'zisismaras@gmail.com'
   s.homepage = 'https://github.com/zisismaras/easycomments'
   s.license = 'MIT'
-end
+end

data/lib/easycomments.rb

@@ -8,7 +8,7 @@ require 'bcrypt'
 require_relative "easycomments/ec_configuration.rb"
 require_relative "easycomments/ec_pagination.rb"
 
-VERSION = "1.0.4"
+VERSION = "1.0.5"
 
 include Configuration
 

data/lib/easycomments/ec_configuration.rb

@@ -4,8 +4,24 @@ module Configuration
   
   extend self
   
+  #allows enviroment variables to be used as a connection option
+  def check_env_var(var)
+    if var =~ /ENV\[(.*)/ || var !~ /(:+)|(\/+)/
+      env_var = var.sub("ENV[", "").sub("]","")
+      var_seq = []
+      env_var.split(//).each do |char|
+        if char =~ /[0-9a-zA-Z]/
+          var_seq.push(char)
+        end
+      end
+      var = ENV[var_seq.join]
+    end
+    var
+  end
+  
+  #configuration constants holding user options from _config.yml
   CONFIG = YAML.load_file('_config.yml')
-  CONNECTION = CONFIG["connection"]
+  CONNECTION = check_env_var(CONFIG["connection"])
   APPROVE_BY_DEFAULT = CONFIG["approve_by_default"]
   ALLOW_ANONYMOUS_POST = CONFIG["allow_anonymous_post"]
   TIMESTAMP_FORMAT = CONFIG["timestamp_format"]
@@ -17,35 +33,36 @@ module Configuration
   PAGINATE = CONFIG["paginate"]
   COMMENTS_PER_PAGE = CONFIG["comments_per_page"].to_i
 
-#wall of help text to be added in _config.yml
+  #wall of help text to be added in _config.yml
   def comment_wall
-comments = <<COMMENTS
-#
-##connection : database connection url to be passed to sequel's connect method.
-##check http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html
-##all adapters supported by sequel can be used
-#
-##approve_by_default : set to true to allow all coments to be posted without moderation.
-#
-##allow_anonymous_post : set to true to allow comments without a name.
-#
-##timestamp_format : datetime format to be passed to strftime.
-##see availabe options here http://ruby-doc.org/core-2.2.1/Time.html#method-i-strftime
-#
-##allow_cors : set to true to enable cross-origin resource sharing.
-#
-##cors_origin : see available formats here https://github.com/cyu/rack-cors
-#
-##auto_escape_html : automatically escape html in comment bodies
-#
-##paginate : set to true to have pagination support in comment retrieval
-#
-##comments_per_page : how many comments to return per page if paginate is true
-#
-##users : do not edit this by hand use 'rake adduser' instead.
-#
-##if you edit this file after 'rake init' use 'rake update' for the changes to take effect.
-#
-COMMENTS
+    comments = <<-COMMENTS
+    #
+    ##connection : database connection url to be passed to sequel's connect method.
+    ##check http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html
+    ##all adapters supported by sequel can be used
+    ##you can also use an enviroment variable formatted as ENV["variable"] or just "variable" holding your db's url
+    #
+    ##approve_by_default : set to true to allow all coments to be posted without moderation.
+    #
+    ##allow_anonymous_post : set to true to allow comments without a name.
+    #
+    ##timestamp_format : datetime format to be passed to strftime.
+    ##see availabe options here http://ruby-doc.org/core-2.2.1/Time.html#method-i-strftime
+    #
+    ##allow_cors : set to true to enable cross-origin resource sharing.
+    #
+    ##cors_origin : see available formats here https://github.com/cyu/rack-cors
+    #
+    ##auto_escape_html : automatically escape html in comment bodies
+    #
+    ##paginate : set to true to have pagination support in comment retrieval
+    #
+    ##comments_per_page : how many comments to return per page if paginate is true
+    #
+    ##users : do not edit this by hand use 'rake adduser' instead.
+    #
+    ##if you edit this file after 'rake init' use 'rake update' for the changes to take effect.
+    #
+    COMMENTS
   end
 end

data/spec/ec/ec_utils_spec.rb

@@ -0,0 +1,34 @@
+require_relative '../spec_helper.rb'
+
+RSpec.configure do |config|
+  config.before(:all){
+    #set an example env variable
+    ENV["MYDB"] = "sqlite://blog.db" 
+  }
+end
+
+describe "allow enviroment variables as a connection option" do
+  let(:conn_url) { "sqlite://blog.db" }
+  context "with ENV[]" do
+    context "with quotes" do
+      it "returns the corrent connection url" do
+        expect(Configuration::check_env_var("ENV[\"MYDB\"]")).to be == conn_url
+      end
+    end
+    context "without quotes" do
+      it "returns the corrent connection url" do
+        expect(Configuration::check_env_var("ENV[MYDB]")).to be == conn_url
+      end
+    end
+  end
+  context "without ENV[]" do
+    it "returns the corrent connection url" do
+      expect(Configuration::check_env_var("MYDB")).to be == conn_url
+    end
+  end
+  context "normal URL" do
+    it "returns the corrent connection url" do
+      expect(Configuration::check_env_var(conn_url)).to be == conn_url
+    end
+  end  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easycomments
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Zisis Maras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies: []
 description: |
   EasyComments(EC) is an easy to use comment system with a simple api
@@ -20,6 +20,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -398,6 +399,7 @@ files:
 - public/polymer-loader.vulcanized.html
 - spec/ec/ec_dashboard_spec.rb
 - spec/ec/ec_spec.rb
+- spec/ec/ec_utils_spec.rb
 - spec/spec_helper.rb
 - views/index.html
 homepage: https://github.com/zisismaras/easycomments
@@ -412,7 +414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="