redis-settings 0.2.1 → 0.2.2

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://gems.simplesideias.com.br"
+source :rubygems
 gemspec

data/Gemfile.lock

@@ -1,65 +1,50 @@
 PATH
   remote: .
   specs:
-    redis-settings (0.2.1)
+    redis-settings (0.2.2)
       redis
 
 GEM
-  remote: http://gems.simplesideias.com.br/
+  remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.9)
-    archive-tar-minitar (0.5.2)
-    arel (2.0.10)
-    builder (2.1.2)
-    columnize (0.3.3)
-    diff-lcs (1.1.2)
-    i18n (0.5.0)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    rake (0.8.7)
-    redis (2.2.1)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    tzinfo (0.3.28)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.11)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    diff-lcs (1.1.3)
+    i18n (0.6.1)
+    multi_json (1.5.0)
+    rake (10.0.3)
+    redis (3.0.2)
+    redis-namespace (1.2.1)
+      redis (~> 3.0.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord
-  rake (~> 0.8.7)
+  rake
   redis-namespace
   redis-settings!
-  rspec (~> 2.6)
-  ruby-debug19
-  sqlite3-ruby
+  rspec
+  sqlite3

data/lib/redis/settings.rb

@@ -66,7 +66,7 @@ class Redis
         value = payload["data"]
       end
 
-      value || default
+      value.nil? ? default : value
     end
 
     # Define a value for the specified setting.

data/lib/redis/settings/version.rb

@@ -3,7 +3,7 @@ class Redis
     module Version
       MAJOR = 0
       MINOR = 2
-      PATCH = 1
+      PATCH = 2
       STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     end
   end

data/redis-settings.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "redis/settings/version"
+require "./lib/redis/settings/version"
 
 Gem::Specification.new do |s|
   s.name        = "redis-settings"
@@ -8,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nando Vieira"]
   s.email       = ["fnando.vieira@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "http://github.com/fnando/redis-settings"
   s.summary     = %[Store application and user settings on Redis. Comes with ActiveRecord support.]
   s.description = s.summary
 
@@ -18,10 +17,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "redis"
-  s.add_development_dependency "rake", "~> 0.8.7"
-  s.add_development_dependency "rspec", "~> 2.6"
-  s.add_development_dependency "ruby-debug19"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
   s.add_development_dependency "activerecord"
   s.add_development_dependency "redis-namespace"
-  s.add_development_dependency "sqlite3-ruby"
+  s.add_development_dependency "sqlite3"
 end

data/spec/redis/settings_spec.rb

@@ -1,25 +1,27 @@
 require "spec_helper"
 
 describe Redis::Settings do
-  subject { Redis::Settings.new("app") }
+  subject(:settings) { Redis::Settings.new("app") }
   let(:redis) { Redis::Settings.connection }
 
   before do
-    subject.clear
+    settings.clear
   end
 
   describe "#all" do
     it "returns all settings" do
-      subject[:items] = 10
-      subject[:enabled] = true
+      settings[:items] = 10
+      settings[:enabled] = true
 
-      subject.all.should == {:items => 10, :enabled => true}
+      expect(settings.all).to eq(:items => 10, :enabled => true)
     end
   end
 
   describe ".configure" do
     it "yields module" do
-      Redis::Settings.configure {|config| config.should be(Redis::Settings)}
+      expect {|block|
+        Redis::Settings.configure(&block)
+      }.to yield_with_args(Redis::Settings)
     end
   end
 
@@ -28,82 +30,102 @@ describe Redis::Settings do
     after { Redis::Settings.root_namespace = "settings" }
 
     it "uses custom namespace" do
-      subject.namespace.should == "settings/development/app"
+      expect(settings.namespace).to eq("settings/development/app")
     end
 
     it "sets value using custom namespace" do
-      subject[:items] = 10
-      JSON.parse(redis.hget("settings/development/app", :items)).should == {"data" => 10}
+      settings[:items] = 10
+      payload = JSON.parse(
+        redis.hget("settings/development/app", :items)
+      )
+
+      expect(payload).to eq("data" => 10)
     end
   end
 
   describe "#namespace" do
     it "includes settings as namespace root" do
-      subject.namespace.should == "settings/app"
+      expect(settings.namespace).to eq("settings/app")
     end
   end
 
   describe "#set" do
     it "sets value" do
-      subject.set(:items, 5)
-      JSON.parse(redis.hget(subject.namespace, :items)).should == {"data" => 5}
+      settings.set(:items, 5)
+      payload = JSON.parse(
+        redis.hget(settings.namespace, :items)
+      )
+
+      expect(payload).to eq("data" => 5)
     end
 
     it "has shortcut" do
-      subject[:items] = 10
-      JSON.parse(redis.hget(subject.namespace, :items)).should == {"data" => 10}
+      settings[:items] = 10
+      payload = JSON.parse(
+        redis.hget(settings.namespace, :items)
+      )
+
+      expect(payload).to eq("data" => 10)
     end
 
     it "removes setting when assigning nil" do
-      subject[:items] = 20
-      subject[:items] = nil
-      redis.hget(subject.namespace, :items).should be_nil
+      settings[:items] = 20
+      settings[:items] = nil
+
+      expect(redis.hget(settings.namespace, :items)).to be_nil
     end
   end
 
   describe "#remove" do
     it "removes option" do
-      subject[:items] = 20
-      subject.remove(:items)
-      redis.hget(subject.namespace, :items).should be_nil
+      settings[:items] = 20
+      settings.remove(:items)
+
+      expect(redis.hget(settings.namespace, :items)).to be_nil
     end
 
     it "has alias" do
-      subject[:items] = 20
-      subject.delete(:items)
-      redis.hget(subject.namespace, :items).should be_nil
+      settings[:items] = 20
+      settings.delete(:items)
+
+      expect(redis.hget(settings.namespace, :items)).to be_nil
     end
   end
 
   describe "#get" do
     it "gets value" do
-      subject.set(:items, 5)
-      subject.get(:items).should == 5
+      settings.set(:items, 5)
+      expect(settings.get(:items)).to eq(5)
     end
 
     it "has #[] alias" do
-      subject[:items] = 10
-      subject[:items].should == 10
+      settings[:items] = 10
+      expect(settings[:items]).to eq(10)
     end
 
     it "has #fetch alias" do
-      subject[:items] = 10
-      subject.fetch(:items).should == 10
+      settings[:items] = 10
+      expect(settings.fetch(:items)).to eq(10)
     end
 
     it "returns default value" do
-      subject[:items] = nil
-      subject.get(:items, 15).should == 15
+      settings[:items] = nil
+      expect(settings.get(:items, 15)).to eq(15)
+    end
+
+    it "returns false as default value" do
+      settings[:item] = false
+      expect(settings.get(:item, true)).to eq(false)
     end
   end
 
   describe "#clear" do
     it "removes all settings" do
-      subject[:items] = 5
+      settings[:items] = 5
 
-      redis.hgetall(subject.namespace).should_not be_empty
-      subject.clear
-      redis.hgetall(subject.namespace).should be_empty
+      expect(redis.hgetall(settings.namespace)).not_to be_empty
+      settings.clear
+      expect(redis.hgetall(settings.namespace)).to be_empty
     end
   end
 end

data/spec/support/user.rb

@@ -3,6 +3,6 @@ end
 
 module Admin
   class User < ActiveRecord::Base
-    set_table_name "users"
+    self.table_name = "users"
   end
 end

metadata

@@ -1,104 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: redis-settings
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redis
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.6"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-description: Store application and user settings on Redis. Comes with ActiveRecord support.
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Store application and user settings on Redis. Comes with ActiveRecord
+  support.
+email:
 - fnando.vieira@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -115,41 +131,28 @@ files:
 - spec/redis/settings_spec.rb
 - spec/spec_helper.rb
 - spec/support/user.rb
-homepage: ""
+homepage: http://github.com/fnando/redis-settings
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1544773941053479143
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1544773941053479143
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Store application and user settings on Redis. Comes with ActiveRecord support.
-test_files: 
-- spec/redis/settings/active_record_spec.rb
-- spec/redis/settings_spec.rb
-- spec/spec_helper.rb
-- spec/support/user.rb
+test_files: []