simple_record 2.2.0 → 4.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6d82f7f10721f3429254cd5cbf854e2e77215c9b
+  data.tar.gz: 8e12f1815cff1df1e25bb2a867ea69fb26ebc1da
+SHA512:
+  metadata.gz: ec8b1a17a7af48055349f0f3c1aa8fb65ef1643ea5b69064f20b0b60c69f0bd9a5fb2fb919750a4e7e69f8e0bbe0ad7ec2b364068308eea9cc4bdb4b67d43de9
+  data.tar.gz: b1843214f7d63f97b2a18e688a83be8bee04c5819cbcd78cc9faa49cdfd4af60343b8a9b74d162d6ed89b742590560122466f07c8b74f0fe96196168f28e53bd

data/lib/simple_record.rb

@@ -27,7 +27,12 @@
 require 'aws'
 require 'base64'
 require 'active_support'
-require 'active_support/core_ext'
+if ActiveSupport::VERSION::MAJOR >= 3
+  # had to do this due to some bug: https://github.com/rails/rails/issues/12876
+  # fix: https://github.com/railsmachine/shadow_puppet/pull/19/files
+  require 'active_support/deprecation'
+  require 'active_support/core_ext'
+end
 begin
   # comment out line below to test rails2 validations
   require 'active_model'
@@ -98,6 +103,9 @@ module SimpleRecord
     def close_usage_log(type)
       return unless @usage_logging_options[type]
       @usage_logging_options[type][:file].close if @usage_logging_options[type][:file]
+      # unless we remove it, it will keep trying to log these events
+      # and will fail because the file is closed.
+      @usage_logging_options.delete(type)
     end
 
     def usage_logging_options
@@ -502,7 +510,7 @@ module SimpleRecord
     def create_or_update(options) #:nodoc:
                                   #      puts 'create_or_update'
       ret = true
-      _run_save_callbacks do
+      run_callbacks :save do
         result = new_record? ? create(options) : update(options)
 #        puts 'save_callbacks result=' + result.inspect
         ret = result
@@ -513,7 +521,7 @@ module SimpleRecord
     def create(options) #:nodoc:
       puts '3 create'
       ret = true
-      _run_create_callbacks do
+      run_callbacks :create do
         x = do_actual_save(options)
 #        puts 'create old_save result=' + x.to_s
         ret = x
@@ -525,7 +533,7 @@ module SimpleRecord
     def update(options) #:nodoc:
       puts '3 update'
       ret = true
-      _run_update_callbacks do
+      run_callbacks :update do
         x = do_actual_save(options)
 #        puts 'update old_save result=' + x.to_s
         ret = x
@@ -773,20 +781,19 @@ module SimpleRecord
       results = []
       to_save = []
       if objects && objects.size > 0
-        objects.each do |o|
-          ok = o.pre_save(options)
-          raise "Pre save failed on object [" + o.inspect + "]" if !ok
-          results << ok
-          next if !ok # todo: this shouldn't be here should it?  raises above
-          o.pre_save2
-          to_save << Aws::SdbInterface::Item.new(o.id, o.attributes, true)
-          if to_save.size == 25 # Max amount SDB will accept
-            connection.batch_put_attributes(domain, to_save, options)
-            to_save.clear
+        objects.each_slice(25) do |objs|
+          objs.each do |o|
+            ok = o.pre_save(options)
+            raise "Pre save failed on object [" + o.inspect + "]" if !ok
+            results << ok
+            next if !ok # todo: this shouldn't be here should it?  raises above
+            o.pre_save2
+            to_save << Aws::SdbInterface::Item.new(o.id, o.attributes, true)
           end
+          connection.batch_put_attributes(domain, to_save, options)
+          to_save.clear
         end
       end
-      connection.batch_put_attributes(domain, to_save, options) if to_save.size > 0
       objects.each do |o|
         o.save_lobs(nil)
       end
@@ -796,8 +803,9 @@ module SimpleRecord
       # Pass in an array of objects
     def self.batch_delete(objects, options={})
       if objects
-        # 25 item limit, we should maybe handle this limit in here.
-        connection.batch_delete_attributes @domain, objects.collect { |x| x.id }
+        objects.each_slice(25) do |objs|
+          connection.batch_delete_attributes @domain, objs.collect { |x| x.id }
+        end
       end
     end
 
@@ -844,7 +852,7 @@ module SimpleRecord
 
     def destroy
       if @@active_model
-        _run_destroy_callbacks do
+        run_callbacks :destroy do
           delete
         end
       else

data/lib/simple_record/active_sdb.rb

@@ -20,13 +20,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-
-begin
-  require 'uuidtools'
-rescue LoadError => e
-  STDERR.puts("SimpleRecord requires the uuidtools gem.  Run \'gem install uuidtools\' and try again.")
-  exit
-end
+require 'uuidtools'
 
 module SimpleRecord
 
@@ -355,7 +349,8 @@ module SimpleRecord
         end
 
         def generate_id # :nodoc:
-          UUIDTools::UUID.timestamp_create().to_s
+          # mac address creation sometimes throws errors if mac address isn't available
+          UUIDTools::UUID.random_create().to_s
         end
 
         protected

data/lib/simple_record/attributes.rb

@@ -219,24 +219,19 @@ module SimpleRecord
         define_dirty_methods(arg_s)
       end
 
-      def has_many(*args)
-        args.each do |arg|
-          #okay, this creates an instance method with the pluralized name of the symbol passed to belongs_to
-          send(:define_method, arg) do
-            #when called, the method creates a new, very temporary instance of the Activerecordtosdb_subrecord class
-            #It is passed the three initializers it needs:
-            #note the first parameter is just a string by time new gets it, like "user"
-            #the second and third parameters are still a variable when new gets it, like user_id
-            return eval(%{Activerecordtosdb_subrecord_array.new('#{arg}', self.class.name ,id)})
-          end
+      # allows foreign key through class_name
+      # i.e. options[:class_name] = 'User'
+      def has_many(association_id, options = {})
+
+        send(:define_method, association_id) do
+          return eval(%{Activerecordtosdb_subrecord_array.new('#{options[:class_name] ? options[:class_name] : association_id}', '#{options[:class_name] ? association_id.to_s : self.class.name}', id)})
         end
-        #Disclaimer: this whole funciton just seems crazy to me, and a bit inefficient. But it was the clearest way I could think to do it code wise.
-        #It's bad programming form (imo) to have a class method require something that isn't passed to it through it's variables.
-        #I couldn't pass the id when calling find, since the original find doesn't work that way, so I was left with this.
       end
 
-      def has_one(*args)
-
+      def has_many(association_id, options = {})
+        send(:define_method, association_id) do
+          return eval(%{Activerecordtosdb_subrecord_array.new('#{options[:class_name] ? options[:class_name] : association_id}', '#{options[:class_name] ? association_id.to_s : self.class.name}', id)}).first
+        end
       end
 
 
@@ -437,4 +432,4 @@ module SimpleRecord
     end
 
   end
-end
+end

data/lib/simple_record/translations.rb

@@ -119,6 +119,8 @@ module SimpleRecord
         value = to_date(value)
       elsif att_meta.type == :boolean
         value = to_bool(value)
+      elsif att_meta.type == :float
+        value = Float(value)
       end
       value
     end
@@ -303,4 +305,4 @@ module SimpleRecord
     end
   end
 
-end
+end

data/lib/simple_record/validations.rb

@@ -71,7 +71,9 @@ module SimpleRecord
         val = self.send(k)
         puts 'val=' + val.inspect
         if val
-          ret = self.class.find(:first, :conditions=>["#{k}=?", val])
+          conditions = new_record? ? ["#{k}=?", val] : ["#{k}=? AND id != ?", val, self.id]
+
+          ret = self.class.find(:first, :conditions=>conditions)
           puts 'ret=' + ret.inspect
           if ret
             errors.add(k, "must be unique.")

metadata

@@ -1,51 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simple_record
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.2.0
+version: !ruby/object:Gem::Version
+  version: 4.0.0
 platform: ruby
-authors: 
+authors:
 - Travis Reeder
 - Chad Arimura
 - RightScale
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: aws
+date: 2012-01-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: concur
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: ActiveRecord like interface for Amazon SimpleDB. Store, query, shard, etc. By http://www.appoxy.com
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: concur
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ActiveRecord like interface for Amazon SimpleDB. Store, query, shard,
+  etc. By http://www.appoxy.com
 email: travis@appoxy.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- LICENSE.markdown
+- README.markdown
+files:
 - LICENSE.markdown
 - README.markdown
-files: 
 - lib/simple_record.rb
 - lib/simple_record/active_sdb.rb
 - lib/simple_record/attributes.rb
@@ -60,34 +121,27 @@ files:
 - lib/simple_record/stats.rb
 - lib/simple_record/translations.rb
 - lib/simple_record/validations.rb
-- LICENSE.markdown
-- README.markdown
 homepage: http://github.com/appoxy/simple_record/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord like interface for Amazon SimpleDB. By http://www.appoxy.com
 test_files: []
-