activeobject 0.0.3 → 0.0.4

data/CHANGE

@@ -8,3 +8,7 @@ v0.0.2  2009-9-24
 
 v0.0.3  2009-9-25
 - 修复对象to_json时没有包含对象id
+
+v0.0.4
+- 修复当修改Model时，实例化object报错的Bug.
+- 对象新增update_attributes属性.

data/active-object.gemspec

@@ -30,7 +30,7 @@ Gem::Specification::Class.send :include,DirExt
 
 Gem::Specification.new do |s|
 	s.name = %{activeobject}
-	s.version = '0.0.3'
+	s.version = '0.0.4'
 	s.description = 'Active Object是用来访问LightCloud/TokyoCabinet/TokyoTyrant的工具，实现了持久化数据与对象的映射。 它类似于ActiveRecord，提供一组访问LightCloud/TokyoCabinet/TokyoTyrant的方法以及验证规则、回调函数和观察器。'
 	s.homepage = "http://www.tokyocabinet.com"
 	s.rubyforge_project = %q{activeobject}

data/lib/active_object/base.rb

@@ -288,7 +288,7 @@ module ActiveObject
 
 		end
 
-		def initialize(attributes = nil)
+		def initialize(attributes = {})
 			self.id = UUID.new.generate
 			@new_record = true
 			assign_attributes(attributes)
@@ -327,6 +327,14 @@ module ActiveObject
       @destroyed = true
     end
 
+		# 更新对象属性
+		#  <tt>options</tt>是需要更新的一组Hash
+    def update_attributes(options={})
+    	options.each do |key,value|
+    		self.send("#{key}=",value) if self.respond_to?("#{key}=")
+    	end
+    end
+
     def destroy
     	delete
     end
@@ -377,10 +385,11 @@ module ActiveObject
         !value.blank?
       end
 
-			def assign_attributes(attributes=nil)
-				attributes.each do |key,value|
-					self.send "#{key}=",value
-				end unless attributes.nil?
+			def assign_attributes(attrs={})
+				return if attrs.nil? || attrs.size==0
+				attrs.each do |key,value|
+					self.send("#{key}=",value) if self.respond_to?("#{key}=")
+				end unless attrs.empty?
 			end
 
 			def create_or_update

data/lib/active_support/base64.rb

@@ -0,0 +1,33 @@
+begin
+  require 'base64'
+rescue LoadError
+end
+
+module ActiveSupport
+  if defined? ::Base64
+    Base64 = ::Base64
+  else
+    # Base64 provides utility methods for encoding and de-coding binary data 
+    # using a base 64 representation. A base 64 representation of binary data
+    # consists entirely of printable US-ASCII characters. The Base64 module
+    # is included in Ruby 1.8, but has been removed in Ruby 1.9.
+    module Base64
+      # Encodes a string to its base 64 representation. Each 60 characters of
+      # output is separated by a newline character.
+      #
+      #  ActiveSupport::Base64.encode64("Original unencoded string") 
+      #  # => "T3JpZ2luYWwgdW5lbmNvZGVkIHN0cmluZw==\n"
+      def self.encode64(data)
+        [data].pack("m")
+      end
+
+      # Decodes a base 64 encoded string to its original representation.
+      #
+      #  ActiveSupport::Base64.decode64("T3JpZ2luYWwgdW5lbmNvZGVkIHN0cmluZw==") 
+      #  # => "Original unencoded string"
+      def self.decode64(data)
+        data.unpack("m").first
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/array/conversions.rb

@@ -4,73 +4,6 @@ module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Array #:nodoc:
       module Conversions
-        # Converts the array to a comma-separated sentence where the last element is joined by the connector word. Options:
-        # * <tt>:connector</tt> - The word used to join the last element in arrays with two or more elements (default: "and")
-        # * <tt>:skip_last_comma</tt> - Set to true to return "a, b and c" instead of "a, b, and c".        
-        def to_sentence(options = {})          
-          options.assert_valid_keys(:connector, :skip_last_comma, :locale)
-          
-          default = I18n.translate(:'support.array.sentence_connector', :locale => options[:locale])
-          default_skip_last_comma = I18n.translate(:'support.array.skip_last_comma', :locale => options[:locale])
-          options.reverse_merge! :connector => default, :skip_last_comma => default_skip_last_comma
-          options[:connector] = "#{options[:connector]} " unless options[:connector].nil? || options[:connector].strip == ''
-
-          case length
-            when 0
-              ""
-            when 1
-              self[0].to_s
-            when 2
-              "#{self[0]} #{options[:connector]}#{self[1]}"
-            else
-              "#{self[0...-1].join(', ')}#{options[:skip_last_comma] ? '' : ','} #{options[:connector]}#{self[-1]}"
-          end
-        end
-        
-
-        # Calls <tt>to_param</tt> on all its elements and joins the result with
-        # slashes. This is used by <tt>url_for</tt> in Action Pack. 
-        def to_param
-          collect { |e| e.to_param }.join '/'
-        end
-
-        # Converts an array into a string suitable for use as a URL query string,
-        # using the given +key+ as the param name.
-        #
-        #   ['Rails', 'coding'].to_query('hobbies') # => "hobbies%5B%5D=Rails&hobbies%5B%5D=coding"
-        def to_query(key)
-          prefix = "#{key}[]"
-          collect { |value| value.to_query(prefix) }.join '&'
-        end
-
-        def self.included(base) #:nodoc:
-          base.class_eval do
-            alias_method :to_default_s, :to_s
-            alias_method :to_s, :to_formatted_s
-          end
-        end
-
-        # Converts a collection of elements into a formatted string by calling
-        # <tt>to_s</tt> on all elements and joining them:
-        #
-        #   Blog.find(:all).to_formatted_s # => "First PostSecond PostThird Post"
-        #
-        # Adding in the <tt>:db</tt> argument as the format yields a prettier
-        # output:
-        #
-        #   Blog.find(:all).to_formatted_s(:db) # => "First Post,Second Post,Third Post"
-        def to_formatted_s(format = :default)
-          case format
-            when :db
-              if respond_to?(:empty?) && self.empty?
-                "null"
-              else
-                collect { |element| element.id }.join(",")
-              end
-            else
-              to_default_s
-          end
-        end
 
         # Returns a string that represents this array in XML by sending +to_xml+
         # to each element. Active Record collections delegate their representation
@@ -150,7 +83,7 @@ module ActiveSupport #:nodoc:
         def to_xml(options = {})
           raise "Not all elements respond to to_xml" unless all? { |e| e.respond_to? :to_xml }
 
-          options[:root]     ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? first.class.to_s.underscore.pluralize : "records"
+          options[:root]     ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? first.class.to_s.underscore.pluralize : "objects"
           options[:children] ||= options[:root].singularize
           options[:indent]   ||= 2
           options[:builder]  ||= Builder::XmlMarkup.new(:indent => options[:indent])

data/lib/active_support/core_ext/hash/conversions.rb

@@ -97,20 +97,6 @@ module ActiveSupport #:nodoc:
           klass.extend(ClassMethods)
         end
 
-        # Converts a hash into a string suitable for use as a URL query string. An optional <tt>namespace</tt> can be
-        # passed to enclose the param names (see example below).
-        #
-        # ==== Example:
-        #   { :name => 'David', :nationality => 'Danish' }.to_query # => "name=David&nationality=Danish"
-        #
-        #   { :name => 'David', :nationality => 'Danish' }.to_query('user') # => "user%5Bname%5D=David&user%5Bnationality%5D=Danish"
-        def to_query(namespace = nil)
-          collect do |key, value|
-            value.to_query(namespace ? "#{namespace}[#{key}]" : key)
-          end.sort * '&'
-        end
-        
-        alias_method :to_param, :to_query
 
         def to_xml(options = {})
           options[:indent] ||= 2
@@ -159,7 +145,7 @@ module ActiveSupport #:nodoc:
                   end
               end
             end
-            
+
             yield options[:builder] if block_given?
           end
 
@@ -210,7 +196,7 @@ module ActiveSupport #:nodoc:
                   # blank or nil parsed values are represented by nil
                   elsif value.blank? || value['nil'] == 'true'
                     nil
-                  # If the type is the only element which makes it then 
+                  # If the type is the only element which makes it then
                   # this still makes the value nil, except if type is
                   # a XML node(where type['value'] is a Hash)
                   elsif value['type'] && value.size == 1 && !value['type'].is_a?(::Hash)
@@ -220,7 +206,7 @@ module ActiveSupport #:nodoc:
                       h[k] = typecast_xml_value(v)
                       h
                     end
-                    
+
                     # Turn { :files => { :file => #<StringIO> } into { :files => #<StringIO> } so it is compatible with
                     # how multipart uploaded files from HTML appear
                     xml_value["file"].is_a?(StringIO) ? xml_value["file"] : xml_value

data/lib/active_support/core_ext/string/inflections.rb

@@ -63,7 +63,7 @@ module ActiveSupport #:nodoc:
         alias_method :titlecase, :titleize
 
         # The reverse of +camelize+. Makes an underscored, lowercase form from the expression in the string.
-        # 
+        #
         # +underscore+ will also change '::' to '/' to convert namespaces to paths.
         #
         #   "ActiveRecord".underscore         # => "active_record"
@@ -88,7 +88,7 @@ module ActiveSupport #:nodoc:
         end
 
         # Replaces special characters in a string so that it may be used as part of a 'pretty' URL.
-        # 
+        #
         # ==== Examples
         #
         #   class Person
@@ -96,10 +96,10 @@ module ActiveSupport #:nodoc:
         #       "#{id}-#{name.parameterize}"
         #     end
         #   end
-        # 
+        #
         #   @person = Person.find(1)
         #   # => #<Person id: 1, name: "Donald E. Knuth">
-        # 
+        #
         #   <%= link_to(@person.name, person_path %>
         #   # => <a href="/person/1-donald-e-knuth">Donald E. Knuth</a>
         def parameterize
@@ -129,27 +129,16 @@ module ActiveSupport #:nodoc:
         def classify
           Inflector.classify(self)
         end
-        
+
         # Capitalizes the first word, turns underscores into spaces, and strips '_id'.
         # Like +titleize+, this is meant for creating pretty output.
         #
-        #   "employee_salary" # => "Employee salary" 
+        #   "employee_salary" # => "Employee salary"
         #   "author_id"       # => "Author"
         def humanize
           Inflector.humanize(self)
         end
 
-        # Creates a foreign key name from a class name.
-        # +separate_class_name_and_id_with_underscore+ sets whether
-        # the method should put '_' between the name and 'id'.
-        #
-        # Examples
-        #   "Message".foreign_key        # => "message_id"
-        #   "Message".foreign_key(false) # => "messageid"
-        #   "Admin::Post".foreign_key    # => "post_id"
-        def foreign_key(separate_class_name_and_id_with_underscore = true)
-          Inflector.foreign_key(self, separate_class_name_and_id_with_underscore)
-        end
 
         # +constantize+ tries to find a declared constant with the name specified
         # in the string. It raises a NameError when the name is not in CamelCase

data/spec/case/base_test.rb

@@ -71,4 +71,10 @@ class BaseTest < Test::Unit::TestCase
 			@u.destroy
 		end
 	end
+
+	def test_update_attributes
+		@u = User.create(@attributes)
+		@u.update_attributes(:name=>'kame')
+		assert_equal @u.name,"kame"
+	end
 end

data/spec/case/serialization_test.rb

@@ -5,9 +5,6 @@ require 'rubygems'
 
 require 'builder'
 
-user = Array(User.new(@attributes))
-puts user.to_json
-
 class SerializationTest < Test::Unit::TestCase
 	def setup
 		@attributes = {:name=>'Aaron',:email=>'aaron@nonobo.com',:password=>'123456'}

data/spec/case/validations_test.rb

@@ -163,10 +163,11 @@ class ValidationsTest < Test::Unit::TestCase
         hits += 1
       end
     end
-    t = Topic.new("title" => "valid", "content" => "whatever")
+    t = Topic.new(:title=> "valid", :content=>"whatever")
     assert !t.save
     assert_equal 4, hits
     assert_equal %w(gotcha gotcha), t.errors.on(:title)
+
     assert_equal %w(gotcha gotcha), t.errors.on(:content)
   ensure
     perform = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activeobject
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - yalong zhang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-25 00:00:00 +08:00
+date: 2009-09-27 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,6 +123,7 @@ files:
 - ./lib/active_support/core_ext/class/inheritable_attributes.rb
 - ./lib/active_support/core_ext/class/removal.rb
 - ./lib/active_support/callbacks.rb
+- ./lib/active_support/base64.rb
 - ./MIT-LICENSE
 - ./spec/helper.rb
 - ./spec/model/account.rb