fossil 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]
-  s.date = %q{2010-06-25}
+  s.date = %q{2010-06-28}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.files = [
@@ -127,7 +127,6 @@ Gem::Specification.new do |s|
      "lib/sequel/serializer/serializer.rb",
      "lib/sequel/serializer/xml_serializer.rb",
      "lib/sequel/sqlite_pervasive_adapter.rb",
-     "lib/serial_number.rb",
      "spec/be_model_with_values_matcher.rb",
      "spec/be_model_with_values_matcher_spec.rb",
      "spec/hash_extentions_spec.rb",

data/lib/fossil.rb

@@ -18,7 +18,6 @@ end
 dir = File.dirname(__FILE__)
 files = [File.join(dir,'number_helper.rb')] +
         [File.join(dir,'hash_extentions.rb')] +
-        [File.join(dir,'serial_number.rb')] +
         [File.join(dir,'sequel','serializer','serializer.rb')] +
         Dir.glob(File.join(dir,'sequel','*.rb')) +
         Dir.glob(File.join(dir,'models','*.rb'))

data/lib/sequel/serializer/json_serializer.rb

@@ -84,7 +84,8 @@ module Sequel
     # to_json ignores the special __ delegator methods ( like 'leg_status__downcase' )
     # that we use in orm.
     def to_fos_json(options = {})
-      fill_hash(options[:methods])
+      options = {:only=>[]}.merge(options)
+      to_json(options)
     end
 
     def from_json(json)

data/lib/sequel/serializer/serializer.rb

@@ -31,7 +31,7 @@ module Sequel
 
       def serializable_method_names
         Array(options[:methods]).inject([]) do |method_attributes, name|
-          method_attributes << name if !name.blank? and @record.respond_to?(name.to_s)
+          method_attributes << name if !name.blank? #and @record.respond_to?(name.to_s)
           method_attributes
         end
       end

data/lib/sequel/serializer/xml_serializer.rb

@@ -151,8 +151,8 @@ module Sequel #:nodoc:
     #       end
     #     end
     #   end
-    def to_fos_xml(options ={}, &block) 
-      options = {:skip_instruct=>true, :dasherize=>false, :only=>[]}.merge(options)
+    def to_fos_xml(options ={}, &block)
+      options = {:skip_instruct=>true, :skip_types=>true, :dasherize=>false, :only=>[]}.merge(options)
       to_xml(options, &block)
     end
 
@@ -209,7 +209,7 @@ module Sequel #:nodoc:
 
     def serializable_method_attributes
       Array(options[:methods]).inject([]) do |method_attributes, name|
-        method_attributes << MethodAttribute.new(name.to_s, @record) if @record.respond_to?(name.to_s)
+        method_attributes << MethodAttribute.new(name.to_s, @record) #if @record.respond_to?(name.to_s)
         method_attributes
       end
     end
@@ -229,6 +229,7 @@ module Sequel #:nodoc:
     end
 
     def add_tag(attribute)
+#      p "add_tag #{attribute} attribute.name=#{attribute.name} options=#{options}  options[:skip_types]=#{options[:skip_types]}"
       builder.tag!(
         reformat_name(attribute.name),
         attribute.value.to_s,
@@ -373,7 +374,7 @@ module ActiveSupport #:nodoc:
     module Array #:nodoc:
       module Conversions
         def to_fos_xml(options = {})
-          to_xml({:skip_instruct=>true, :dasherize=>false, :only=>[]}.merge(options))
+          to_xml({:skip_instruct=>true, :skip_types=>true, :dasherize=>false, :only=>[]}.merge(options))
         end
       end
     end
@@ -385,7 +386,7 @@ module ActiveSupport #:nodoc:
     module Hash #:nodoc:
       module Conversions
         def to_fos_xml(options = {})
-          to_xml({:dasherize=>false, :only=>[]}.merge(options))
+          to_xml({:skip_instruct=>true, :skip_types=>true, :dasherize=>false, :only=>[]}.merge(options))
         end
       end
     end

data/spec/sequel/model_patch_spec.rb

@@ -15,11 +15,11 @@ describe "Sequel::Model extentions" do
       Dude.first.fill_hash([:doo]).should == {:doo=>1}
     end
 
-    describe "recognizes __ in method name and creates delegators only once" do
+    describe "method missing recognizes __ in method name and creates delegators only once" do
       it "for one level deep" do
         mock.proxy(Dude).delegate(:name, :to => :my_friend, :prefix => true, :allow_nil => true)
         Dude.first.fill_hash([:my_friend__name,:my_friend__name]).should == {:my_friend_name=>'dans buddy'}
-        Dude.first.method(:my_friend_name).unbind
+        Dude.send(:remove_method, :my_friend_name)
       end
 
       it "for two levels deep" do
@@ -27,41 +27,15 @@ describe "Sequel::Model extentions" do
         mock.proxy(Horse).delegate(:my_friend, :to => :dude, :prefix => true, :allow_nil => true)
         mock.proxy(Horse).delegate(:name, :to => :dude_my_friend, :prefix => true, :allow_nil => true)
         mock.proxy(Horse).delegate(:kid_date, :to => :dude_my_friend, :prefix => true, :allow_nil => true)
-        h = Horse.first
-        h.fill_hash([:dude__my_friend__kid_date,:dude__my_friend__name]).should == {:dude_my_friend_name=>'dans buddy',:dude_my_friend_kid_date=>1}
-        h.method(:dude_my_friend).unbind
-        h.method(:dude_my_friend_name).unbind
-        h.method(:dude_my_friend_kid_date).unbind
-#        class Horse; remove_method :dude_my_friend; remove_method :dude_my_friend_name; remove_method :dude_my_friend_kid_date; end
+        Horse.first
+        Horse.first.fill_hash([:dude__my_friend__kid_date,:dude__my_friend__name]).should == {:dude_my_friend_name=>'dans buddy',:dude_my_friend_kid_date=>1}
+        Horse.send(:remove_method,:dude_my_friend)
+        Horse.send(:remove_method,:dude_my_friend_name)
+        Horse.send(:remove_method,:dude_my_friend_kid_date)
       end
     end
   end
 
-  describe "method missing recognizes __ in method name and creates delegators only once" do
-    it "for one level deep" do
-      mock.proxy(Dude).delegate(:name, :to => :my_friend, :prefix => true, :allow_nil => true)
-      Dude.first.send(:my_friend__name) == 'dans buddy'
-      Dude.first.respond_to? :my_friend_name
-      Dude.first.send(:my_friend__name) == 'dans buddy'
-#      class Dude; remove_method :my_friend_name; end
-       Dude.first.method(:my_friend_name).unbind
-    end
-
-    it "for two levels deep" do
-      MyFriend.column_alias :kid_date, :'kid - date'
-      mock.proxy(Horse).delegate(:my_friend, :to => :dude, :prefix => true, :allow_nil => true)
-      mock.proxy(Horse).delegate(:name, :to => :dude_my_friend, :prefix => true, :allow_nil => true)
-      mock.proxy(Horse).delegate(:kid_date, :to => :dude_my_friend, :prefix => true, :allow_nil => true)
-      h = Horse.first
-      h.send(:dude__my_friend__name).should == 'dans buddy'
-      h.send(:dude__my_friend__kid_date).should == 1
-      h.method(:dude_my_friend).unbind
-      h.method(:dude_my_friend_name).unbind
-      h.method(:dude_my_friend_kid_date).unbind
-#      class Horse; remove_method :dude_my_friend; remove_method :dude_my_friend_name; remove_method :dude_my_friend_kid_date; end
-    end
-  end
-
   it "can update and save" do
     add_test_table_data({:date_col => 123, :time_col=>60})
     record = TestTable.first
@@ -148,7 +122,7 @@ describe "Sequel::Model extentions" do
       @record.date_col_date_view_mdy.should     == "05/03/1900"
       # ruby 1.9.1 not making date as 5/3/1900, so this just makes it
       # pass .. but eventually we drop that ipc method anyway, so I dont care.
-      @record.date_col_date_view_mdy_ipc.should =~ /[0]+5\/[0]+3\/1900/
+      @record.date_col_date_view_mdy_ipc.should =~ /[0]*5\/[0]*3\/1900/
     end
 
     it "shows correct time view" do

data/spec/sequel/pervasive_adapter_spec.rb

@@ -15,7 +15,7 @@ describe Sequel::Pervasive::DatabaseMethods do
         raise(Exception, 'testing do_transaction transactions')
       end
       ### end testing do_transaction
-    rescue StandardError => e
+    rescue Exception => e
     ensure
       r.drop if r
     end

data/spec/sequel/serializer/json_serializer_spec.rb

@@ -2,21 +2,33 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require File.dirname(__FILE__) + '/../spec_helper_tables' unless metaclass.class_variable_defined? :@@set_up_demo_tables
 
 describe "Sequel::Serializer" do
-  describe "to_fos_json method adds options to only for" do
-    it "single sequel model" do
-      add_test_table_data({:id=>1,:'goofy name col' => 123})
-      data = TestTable.first
-      mock(data).fill_hash([])
+
+  describe "to_fos_json method" do
+
+    it "adds :only=>[] to the options hash" do
+      data = Trip.new
+      mock(data).to_json({:only=>[], :methods=>[]})
       data.to_fos_json(:methods=>[])
     end
 
-    it "an array of sequel models" do
-      add_test_table_data({:id=>1,:'goofy name col' => 123})
+    it "handles single sequel model" do
+      add_test_table_data({:id=>1, :'goofy name col' => 123})
       data = TestTable.first
-      array = [data]
-      mock(data).fill_hash([]) # expecting this method to be called on the data 
-      array.to_fos_json(:methods=>[])
+      data.to_fos_json(:methods=>[:'goofy name col']).should == "{\"goofy name col\":123}"
+    end
+
+    it "handles an array of sequel models" do
+      add_test_table_data({:id=>1, :'goofy name col' => 123})
+      array = [TestTable.first]
+      array.to_fos_json(:methods=>[:'goofy name col']).should==["{\"goofy name col\":123}"]
+    end
+
+    it "shows methods which are dynamically delegated" do
+      add_test_table_data({:id=>1, :'date_col' => 123})
+      data = TestTable.first
+      data.to_fos_json(:methods=>[:date_col__round]).should == "{\"date_col__round\":123}"
     end
 
   end
+
 end

data/spec/sequel/serializer/xml_serializer_spec.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require File.dirname(__FILE__) + '/../spec_helper_tables' unless metaclass.class_variable_defined? :@@set_up_demo_tables
-#require 'active_resource'
 
 describe "Sequel::Serializer" do
  
@@ -8,14 +7,14 @@ describe "Sequel::Serializer" do
     it "single sequel model" do
       add_test_table_data({:id=>1,:'goofy name col' => 123})
       data = TestTable.first
-      mock(data).to_xml({:dasherize=>false, :skip_instruct=>true, :only=>[]})
+      mock(data).to_xml({:skip_instruct=>true, :skip_types=>true, :dasherize=>false, :only=>[]})
       data.to_fos_xml
     end
 
     it "an array of sequel models" do
       add_test_table_data({:id=>1,:'goofy name col' => 123})
       data = [TestTable.first]
-      mock(data).to_xml({:dasherize=>false, :skip_instruct=>true, :only=>[]})
+      mock(data).to_xml({:skip_instruct=>true, :skip_types=>true,  :dasherize=>false, :only=>[]})
       data.to_fos_xml
     end
   end
@@ -32,13 +31,25 @@ describe "Sequel::Serializer" do
        } )
   end
 
+  it "to_xml works with references to dynamic delegated columns" do
+    add_test_table_data({:id=>1,:'date_col' => 123})
+    TestTable.column_alias  :'date_col', :date_col
+
+    TestTable.first.to_fos_xml(:methods => :date_col__round).should equal_xml(
+      %{
+         <test_table>
+            <date_col__round>123</date_col__round>
+         </test_table>
+       } )
+  end
+
   it "to_fos_xml with many to one assoc" do
     Dude.o_to_n :horses, :class=>:Horse, :prefix => 'dude'
 
     Dude.first.to_fos_xml(:only=> :name, :include=> :horses).should equal_xml(
     %{  <dude>
           <name>dano</name>
-          <horses type="array">
+          <horses>
             <horse> <name>pinto</name> </horse>
             <horse> <name>silver</name> </horse>
           </horses>
@@ -62,7 +73,7 @@ describe "Sequel::Serializer" do
     Horse.n_to_o :dude, :class=>:Dude, :prefix=>'dude'
 
     Horse.all.to_fos_xml(:only=> [:name], :include=> :dude).should equal_xml(
-      %{  <horses type="array">
+      %{  <horses>
             <horse> <name>pinto</name>
               <dude> <name>dano</name> </dude>
             </horse>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -07:00
+date: 2010-06-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -180,7 +180,6 @@ files:
 - lib/sequel/serializer/serializer.rb
 - lib/sequel/serializer/xml_serializer.rb
 - lib/sequel/sqlite_pervasive_adapter.rb
-- lib/serial_number.rb
 - spec/be_model_with_values_matcher.rb
 - spec/be_model_with_values_matcher_spec.rb
 - spec/hash_extentions_spec.rb

data/lib/serial_number.rb

@@ -1,14 +0,0 @@
-class SerialNumber
-  attr_reader :max
-
-  def initialize(max)
-    @index= -1
-    @max= max
-  end
-
-  def next
-    @index = -1 if @index == max
-    @index += 1
-    @index
-  end
-end