keytar 1.4.0 → 1.4.1

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/keytar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{keytar}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Schneems"]
-  s.date = %q{2011-07-27}
+  s.authors = [%q{Schneems}]
+  s.date = %q{2011-08-08}
   s.description = %q{
     Keytar is a Ruby on Rails wrapper for KeyBuilder.
     Use KeyBuilder to automatically generate keys based on class name instead of cluttering model
@@ -38,9 +38,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/Schnems/keytar}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{A crazy simple library for building keys  (in _key_ value store, not house keys) for Ruby on Rails}
   s.test_files = [
     "spec/keytar/key_builder_spec.rb",

data/lib/keytar/key_builder.rb

@@ -40,21 +40,20 @@ module KeyBuilder
       options.keys.each do |key|
         options["key_#{key}".to_sym] = options[key] if key.to_s !~ /^key_/
       end
-
       names.each do |name|
         # define (cache) class method
         (class << self;self ;end).instance_eval do
           define_method("#{name}_key") do |*args|
-            options.merge!(:name => name, :base => self.to_s.downcase, :args => args)
-            build_key(options)
+            build_options = options.merge(:name => name, :base => self.to_s.downcase, :args => args)
+            build_key(build_options)
           end
         end
 
         # define (cache) instance method
         class_eval do
           define_method("#{name}_key") do |*args|
-            options.merge!(:name => name, :args => args)
-            build_key(options)
+            build_options = options.merge(:name => name, :args => args)
+            build_key(build_options)
           end
         end
       end

data/spec/keytar/key_builder_spec.rb

@@ -14,6 +14,13 @@ describe KeyBuilder do
       @options = {:name => "foo", :args => nil}
     end
 
+    describe 'manually build key' do
+      it 'works' do
+        foo = Foo.new
+        foo.build_key(:name => "method", :args => "args").should eq("foos:method:args")
+      end
+    end
+
     describe 'build_key' do
       it 'calls other class methods' do
         Foo.should_receive(:build_key_hash)

data/spec/keytar/keytar_spec.rb

@@ -33,6 +33,15 @@ class BarBaz < ActiveRecord::Base
 end
 
 describe Keytar do
+  describe 'class and instance interference' do
+    it 'should not happen' do
+      bar = Bar.create(:name => "whatever")
+      orig_key =  Bar.awesome_key(bar.id)
+      bar.awesome_key(bar.id)
+      second_key = Bar.awesome_key(bar.id)
+      second_key.should eq(orig_key)
+    end
+  end
 
   describe 'cache_key' do
     it 'allows us to pre-define class methods' do
@@ -166,7 +175,7 @@ describe Keytar do
      end
 
      it 'should change key_unique' do
-       Foo.class_eval { def timeish; (Time.now.to_i * 0.01).floor; end}
+       Foo.class_eval { def timeish; (Time.now.to_i * 0.01).floor.to_s; end}
        key_unique = :timeish
        Foo.key_unique key_unique
        Foo.key_unique.should == key_unique
@@ -257,4 +266,5 @@ describe Keytar do
       BarBaz.last.id.should == @id
     end
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: keytar
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Schneems
@@ -15,11 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 -05:00
-default_executable: 
+date: 2011-08-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +27,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: activesupport
   version_requirements: *id001
+  name: activesupport
   prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +43,11 @@ dependencies:
         - 0
         - 4
         version: 3.0.4
-  name: activerecord
   version_requirements: *id002
+  name: activerecord
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +59,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  name: rake
   version_requirements: *id003
+  name: rake
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,11 +75,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  name: jeweler
   version_requirements: *id004
+  name: jeweler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,11 +89,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: autotest-standalone
   version_requirements: *id005
+  name: autotest-standalone
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -105,11 +103,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: autotest-growl
   version_requirements: *id006
+  name: autotest-growl
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -119,9 +117,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rspec
   version_requirements: *id007
+  name: rspec
   prerelease: false
+  type: :development
 description: "\n    Keytar is a Ruby on Rails wrapper for KeyBuilder.\n    Use KeyBuilder to automatically generate keys based on class name instead of cluttering model\n    definitions with tons of redundant key method declarations.\n  "
 email: richard.schneeman@gmail.com
 executables: []
@@ -147,7 +146,6 @@ files:
 - spec/keytar/key_builder_spec.rb
 - spec/keytar/keytar_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/Schnems/keytar
 licenses: 
 - MIT
@@ -177,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A crazy simple library for building keys  (in _key_ value store, not house keys) for Ruby on Rails