has_uuid 0.0.7 → 0.0.8

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+*.swp

data/.rvmrc

@@ -0,0 +1 @@
+rvm --create 1.9.2-p180@has_uuid

data/CHANGELOG.md

@@ -0,0 +1 @@
+* (troessner) Refactor the whole gem and use `class_attribute`.

data/README.markdown

@@ -5,15 +5,7 @@ has_uuid
 
 It depends on the [uuidtools](http://uuidtools.rubyforge.org/) gem.
 
-This is a fork - full credits for the source code go to [has_uuid](http://github.com/norbert/has_uuid).
-
-What I changed:
-
-a) Made it rails 3.1 compatible.
-
-b) Bundler'ized it - you can now use and manage it as a gem, not as a rails plugin.
-
-c) Added generate_uuid as a class method
+Initial credits go to [has_uuid](http://github.com/norbert/has_uuid).
 
 Installation
 ------------
@@ -29,39 +21,33 @@ to your Gemfile and run
 Usage
 -----
 
-	class Post < ActiveRecord::Base
-	  # automatically assign a UUID to the "uuid" column on create
-	  has_uuid
-	end
-
-	class Comment < ActiveRecord::Base
-	  # skip assignment on create
-	  has_uuid :auto => false
-	end
+class Post < ActiveRecord::Base
+  # automatically assign a UUID to the "uuid" column on create
+  has_uuid
+end
 
-	class User < ActiveRecord::Base
-	  # store the UUID in the "token" column, generate version 1 UUIDs
-	  has_uuid :column => :token, :generator => :timestamp
-	end
+class Comment < ActiveRecord::Base
+  # skip assignment on create
+  has_uuid :auto => false
+end
 
-	# assign a UUID if a valid one is not already present
-	@post.assign_uuid
+class User < ActiveRecord::Base
+  # store the UUID in the "token" column
+  has_uuid :column => :token, :generator => :timestamp
+end
 
-	# assign a UUID, replacing whatever is already there
-	@post.assign_uuid(:force => true)
+# assign a UUID if a valid one is not already present
+@post.assign_uuid
 
-	# assign a UUID and save, replacing whatever is there
-	@post.assign_uuid!
+# assign a UUID, replacing whatever is already there
+@post.assign_uuid(:force => true)
 
-	# check if the current UUID is valid
-	@post.uuid_valid?
+# assign a UUID and save, replacing whatever is there
+@post.assign_uuid!
 
-	# Generate a UUID to use it later
-	Post.generate_uuid
+# check if the current UUID is valid
+@post.uuid_valid?
 
-Credits
--------
+# Generate a UUID to use it later
+Post.generate_uuid
 
-* Norbert Crombach
-* Todd Eichel
-* Joerg Batterman

data/has_uuid.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency 'activerecord', '>= 3.0'
+  s.add_dependency 'activerecord', '~> 3.1.0'
   s.add_dependency 'uuidtools'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sqlite3'

data/lib/has_uuid.rb

@@ -1,34 +1,26 @@
 require 'uuidtools'
 
-module ActiveRecord #:nodoc:
-  module Acts #:nodoc:
-    # Use this extension to assign a UUID to your models.
-    #
-    # Example:
-    #
-    #    class Post < ActiveRecord::Base
-    #      has_uuid
-    #    end
-    #
-    # That is all.
+module ActiveRecord
+  module Acts
+    # has_uuid adds a UUID to your models. See the README for details.
     module HasUuid
-      GENERATORS = [:random, :timestamp] #:nodoc:
+      GENERATORS = [:random, :timestamp]
+      DEFAULT_OPTIONS = {:auto => true, :generator => :random, :column => :uuid}
 
-      # Configuration options are:
-      #
-      # * <tt>:column</tt> - specifies the column in which to store the UUID (default: +uuid+).
-      # * <tt>:auto</tt> - specifies whether the plugin should assign a UUID on create (default: true).
-      # * <tt>:generator</tt> - sets the UUID generator. Possible values are <tt>:random</tt> for version 4 (default) and <tt>:timestamp</tt> for version 1.
+      # Class Macro which actually lets models use has_uuid
+      # @param options:
+      # * column:   The column in which to store the UUID (default: uuid).
+      # * auto:     Assign a UUID on create (default: true).
+      # * generator The UUID generator. Possible values are `random` default) and `timestamp`.
       def has_uuid(options = {})
-        options.reverse_merge!(:auto => true, :generator => :random, :column => :uuid)
-        raise ArgumentError, "invalid UUID generator" unless GENERATORS.include?(options[:generator])
+        options.reverse_merge! DEFAULT_OPTIONS
+        raise ArgumentError, "Invalid UUID generator #{options[:generator]}" unless GENERATORS.include?(options[:generator])
 
         class_eval do
-          send :include, InstanceMethods # hide include from RDoc
+          include InstanceMethods
 
           if options[:auto]
-            # always applies to subclasses
-            before_validation(:on => :create) { assign_uuid }
+            before_save(:on => :create) { assign_uuid }
           end
 
           class_attribute :uuid_column
@@ -43,8 +35,7 @@ module ActiveRecord #:nodoc:
         UUIDTools::UUID.send("#{uuid_generator}_create").to_s
       end
 
-
-      module InstanceMethods #:nodoc:
+      module InstanceMethods
         def assign_uuid(options = {})
           return if uuid_valid? unless options[:force]
 

data/lib/has_uuid/version.rb

@@ -1,3 +1,3 @@
 module HasUuid
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/has_uuid_test.rb

@@ -85,4 +85,12 @@ class HasUuidTest < Test::Unit::TestCase
     @thingy.reload
     assert_nil @thingy.uuid
   end
+
+  def should_assign_an_uuid_if_we_do_not_validate_the_overall_record
+    @widget = Widget.new
+    assert_nil @widget.uuid
+    @widget.save :validate => false
+    @widget.reload
+    assert @widget.uuid_valid?
+  end
 end

metadata

@@ -1,73 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: has_uuid
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.8
   prerelease: 
-  version: 0.0.7
 platform: ruby
-authors: 
-- "Timo R\xC3\xB6\xC3\x9Fner"
+authors:
+- Timo Rößner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-28 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &77501590 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *77501590
+- !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &77501200 !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: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *77501200
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &77500880 !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: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *77500880
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &77500450 !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: *id004
+  version_requirements: *77500450
 description: The has_uuid gem adds a UUID to your AR models. See the README for details.
-email: 
+email:
 - timo.roessner@googlemail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .has_uuid.gemspec.swp
+- .rvmrc
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.markdown
@@ -78,39 +76,28 @@ files:
 - rails/init.rb
 - test/has_uuid_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/troessner/has_uuid
 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: 835200193
-      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: 835200193
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: The has_uuid gem adds a UUID to your AR models.
 test_files: []
-