vidibus-versioning 0.1.2 → 0.1.3

data/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2011 Andre Pankratz
+MIT License
+
+Copyright (c) 20111-2013 Andre Pankratz
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -66,7 +66,7 @@ article.version(:next)     # returns the next version of the article
 article.version(:new)      # returns a new version of the article
 ```
 
-To apply a version on the current article itself, call `version` with a bang!:
+To apply a version on the current article itself (without persisting it), call `version` with a bang!:
 
 ```ruby
 article.version!(3) # applies version 3 to the article and returns nil

data/Rakefile

@@ -1,25 +1,17 @@
-require "bundler"
-require "rdoc/task"
-require "rspec"
-require "rspec/core/rake_task"
+require 'bundler'
+require 'rdoc/task'
+require 'rspec'
+require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
 
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "vidibus/versioning/_version"
-
-RSpec::Core::RakeTask.new(:rcov) do |t|
-  t.pattern = "spec/**/*_spec.rb"
-  t.rcov = true
-  t.rcov_opts = ["--exclude", "^spec,/gems/"]
-end
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'vidibus/versioning/_version'
 
 Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "vidibus-sysinfo #{Vidibus::Versioning::VERSION}"
-  rdoc.rdoc_files.include("README*")
-  rdoc.rdoc_files.include("lib/**/*.rb")
-  rdoc.options << "--charset=utf-8"
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = 'vidibus-sysinfo #{Vidibus::Versioning::VERSION}'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.options << '--charset=utf-8'
 end
-
-task :default => :rcov

data/lib/vidibus/versioning/_version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Versioning
-    VERSION = "0.1.2"
+    VERSION = '0.1.3'
   end
 end

data/lib/vidibus/versioning/mongoid.rb

@@ -7,7 +7,7 @@ module Vidibus
         include ::Mongoid::Timestamps
         include Vidibus::Uuid::Mongoid
 
-        has_many :versions, :as => :versioned, :class_name => "Vidibus::Versioning::Version", :dependent => :destroy
+        has_many :versions, :as => :versioned, :class_name => 'Vidibus::Versioning::Version', :dependent => :destroy
 
         field :version_number, :type => Integer, :default => 1
         field :version_updated_at, :type => Time
@@ -67,9 +67,15 @@ module Vidibus
       # Applies attributes of wanted version on self.
       # Stores current attributes in a new version.
       def migrate!(number = nil)
-        raise(MigrationError, "no version given") unless number or version_cache.wanted_version_number
-        version!(number) if number and number != version_cache.wanted_version_number
-        raise(MigrationError, "cannot migrate to current version") if version_cache.self_version
+        unless number || version_cache.wanted_version_number
+          raise(MigrationError, 'no version given')
+        end
+        if number && number != version_cache.wanted_version_number
+          version!(number)
+        end
+        if version_cache.self_version
+          raise(MigrationError, 'cannot migrate to current version')
+        end
 
         set_original_version_obj
 
@@ -99,7 +105,9 @@ module Vidibus
 
       # Raises a validation error if saving fails.
       def save!(*args)
-        raise(::Mongoid::Errors::Validations, self) unless save(*args)
+        unless save(*args)
+          raise(::Mongoid::Errors::Validations, self)
+        end
       end
 
       def delete
@@ -162,10 +170,17 @@ module Vidibus
         # TODO: Setting the following line will cause DelayedJob to loop endlessly. The same should happen if an embedded document is defined as versioned_attribute!
         # original_attributes.merge(version_obj.versioned_attributes).merge(version_cache.wanted_attributes.stringify_keys!)
 
-        a = Hash[*self.class.fields.keys.zip([]).flatten].        # ensure nil fields are included as well
-            merge(version_obj.versioned_attributes)               # add version's attributes
-        filter_versioned_attributes(a).                           # take versioned attributes only
-          merge(version_cache.wanted_attributes.stringify_keys!)  # add options provided with #version call
+        # ensure nil fields are included as well
+        attributes = Hash[*self.class.fields.keys.zip([]).flatten]
+
+        # add version's attributes
+        attributes = attributes.merge(version_obj.versioned_attributes)
+
+        # take versioned attributes only
+        filtered = filter_versioned_attributes(attributes)
+
+        # add options provided with #version call
+        filtered.merge(version_cache.wanted_attributes.stringify_keys!)
       end
 
       # Returns versioned attributes from input by
@@ -187,14 +202,16 @@ module Vidibus
         wanted_version_number = args.first
 
         version_cache.wanted_version_number = case wanted_version_number
-        when :new       then new_version_number
-        when :next      then version_number + 1
-        when :previous  then version_number - 1
+        when :new, 'new' then new_version_number
+        when :next, 'next' then version_number + 1
+        when :previous, 'previous' then version_number - 1
         else
           wanted_version_number.to_i
         end
 
-        version_cache.wanted_version_number = 1 if version_cache.wanted_version_number < 1
+        if version_cache.wanted_version_number < 1
+          version_cache.wanted_version_number = 1
+        end
       end
 
       # Finds or builds a version object containing the record's current attributes.
@@ -216,18 +233,20 @@ module Vidibus
       def version_obj
         version_cache.version_obj ||= begin
           if version_cache.wanted_version_number
-            obj = versions.where(:number => version_cache.wanted_version_number).first
-            unless obj or version_cache.self_version
+            obj = versions.
+              where(:number => version_cache.wanted_version_number).first
+            unless obj || version_cache.self_version
               # versions.to_a # TODO: prefetch versions before building a new one?
-              obj = versions.build(
+              obj = versions.build({
                 :number => version_cache.wanted_version_number,
                 :versioned_attributes => versioned_attributes,
-                :created_at => updated_at_was)
+                :created_at => updated_at_was
+              })
             end
             obj
           else
             editing_time = self.class.versioning_options[:editing_time]
-            if !editing_time or version_updated_at <= (Time.now-editing_time.to_i) or updated_at > Time.now # allow future versions
+            if !editing_time || version_updated_at <= (Time.now-editing_time.to_i) || updated_at > Time.now # allow future versions
               versions.build(:created_at => updated_at_was)
             end
           end
@@ -271,11 +290,16 @@ module Vidibus
           version_cache.original_version_obj.save!
         elsif version_cache.wanted_version_number
           if version_obj
-            saved = version_obj.update_attributes(:versioned_attributes => versioned_attributes, :created_at => updated_at)
+            saved = version_obj.update_attributes({
+              :versioned_attributes => versioned_attributes,
+              :created_at => updated_at
+            })
           end
           return saved unless version_cache.self_version
         elsif version_obj
-          version_obj.update_attributes!(:versioned_attributes => original_attributes)
+          version_obj.update_attributes!({
+            :versioned_attributes => original_attributes
+          })
           self.version_number = version_obj.number + 1
           self.version_updated_at = Time.now
         end

data/lib/vidibus/versioning/version.rb

@@ -9,7 +9,7 @@ module Vidibus
 
       field :versioned_uuid, :type => String
       field :versioned_attributes, :type => Hash, :default => {}
-      field :number, :type => Integer, :default => nil
+      field :number, :type => Integer
 
       index :versioned_uuid
       index :number
@@ -33,7 +33,12 @@ module Vidibus
 
       def set_number
         return if number
-        previous = Version.desc(:number).limit(1).first
+        previous = Version.
+          where({
+            :versioned_id => versioned_id,
+            :versioned_type => versioned_type
+          }).
+          desc(:number).limit(1).first
         self.number = previous ? previous.number + 1 : 1
       end
 

metadata

@@ -1,160 +1,166 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vidibus-versioning
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Andre Pankratz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-14 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongoid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: vidibus-core_extensions
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: vidibus-core_extensions
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: vidibus-uuid
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vidibus-uuid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Versioning designed for advanced usage, like scheduling versions.
 email: andre@vidibus.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/vidibus/versioning/_version.rb
 - lib/vidibus/versioning/errors.rb
 - lib/vidibus/versioning/mongoid.rb
@@ -164,41 +170,32 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-has_rdoc: true
 homepage: https://github.com/vidibus/vidibus-versioning
-licenses: []
-
+licenses:
+- MIT
 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: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1266597105678882758
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: vidibus-versioning
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Advanced versioning for Mongoid models
 test_files: []
-