has_versions 0.4.1 → 0.4.4

data/has_versions.gemspec

@@ -4,7 +4,7 @@ require "has_versions/version"
 
 Gem::Specification.new do |s|
   s.name = "has_versions"
-  s.version = HasVersions::VERSION
+  s.version = '0.4.4'
 
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Grant Rodgers"]

data/lib/has_versions.rb

@@ -3,8 +3,6 @@ require 'active_support/all'
 module HasVersions
   extend ActiveSupport::Autoload
 
-  autoload :Version
-
   autoload :Configuration
   autoload :Versioned
   autoload :Attributes

data/lib/has_versions/diff/simple.rb

@@ -15,7 +15,10 @@ module HasVersions
         
         output = {}.with_indifferent_access
         all_keys.each do |key|
-          output[key] = [ours[key], theirs[key]] if ours[key] != theirs[key] #TEST is it necessary to dup the values?
+          next unless versioning_codable?(key)
+          our_value = versioning_decode_value(key, ours[key])
+          their_value = versioning_decode_value(key, theirs[key])
+          output[key] = [our_value, their_value] if our_value != their_value
         end
         output
       end

data/lib/has_versions/orm/cassandra_object.rb

@@ -10,6 +10,10 @@ module HasVersions
         return if value.nil?
         attribute_definitions[name.to_sym].coder.decode(value)
       end
+
+      def versioning_codable?(name)
+        attribute_definitions.has_key?(name.to_sym)
+      end
     end
   end
 end

data/lib/has_versions/versioned.rb

@@ -6,7 +6,10 @@ module HasVersions
       class_attribute :versioning_configuration
       class_attribute :version_class
 
-      include Attributes
+      include HasVersions::Attributes
+      include HasVersions::Reset::Simple
+      include HasVersions::Diff::Simple
+      extend HasVersions::Reset::FromVersion
     end
 
     module ClassMethods

data/spec/has_versions/diff_spec.rb

@@ -5,6 +5,18 @@ class DiffingVersion < Version; end
 describe DiffingVersion do
   class DiffingVersion
     include HasVersions::Diff::Simple
+
+    def versioning_decode_value(key, value)
+      if key == 'name'
+        value.upcase
+      else
+        value
+      end
+    end
+
+    def versioning_codable?(name)
+      true
+    end
   end
  
   let (:foo) { described_class.new(name: 'foo', argyle: 'socks') }
@@ -15,7 +27,7 @@ describe DiffingVersion do
   end
 
   it 'should return a patch when diffed with another version' do
-    foo.diff(foo2).should include(name: ['foo', 'foo2'])
+    foo.diff(foo2).should include(name: ['FOO', 'FOO2'])
   end
 
   it 'should include patches for attributes added' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_versions
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70274998603500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274998603500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70274998602980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274998602980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simple_uuid
-  requirement: &70274998602500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274998602500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70274998602020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70274998602020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70274998601540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70274998601540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70274998601060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +101,12 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70274998601060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: ActiveModel versioning
 email:
 - grantr@gmail.com
@@ -118,7 +148,6 @@ files:
 - lib/has_versions/orm/cassandra_object.rb
 - lib/has_versions/reset.rb
 - lib/has_versions/reset/simple.rb
-- lib/has_versions/version.rb
 - lib/has_versions/versioned.rb
 - lib/has_versions/versioning_key.rb
 - lib/has_versions/versioning_key/uuid.rb
@@ -157,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: has_versions
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: ActiveModel versioning

data/lib/has_versions/version.rb

@@ -1,4 +0,0 @@
-module HasVersions
-  VERSION = "0.4.1"
-end
-