bsm-models 0.5.4 → 0.5.5

data/lib/bsm/model/has_many_serialized.rb

@@ -1,3 +1,5 @@
+require 'bsm/model/coders/json_column'
+
 module Bsm::Model::HasManySerialized
   extend ActiveSupport::Concern
 
@@ -9,25 +11,6 @@ module Bsm::Model::HasManySerialized
 
   end
 
-  class Coder
-
-    def dump(obj)
-      ActiveSupport::JSON.encode(obj)
-    end
-
-    def load(value)
-      return [] if value.nil?
-      return value unless value.is_a?(String)
-
-      obj = ActiveSupport::JSON.decode(value) || []
-      unless obj.is_a?(Array)
-        raise ActiveRecord::SerializationTypeMismatch, "Attribute was supposed to be an Array, but was a #{obj.class}"
-      end
-      obj
-    end
-
-  end
-
   class Builder < ActiveRecord::Associations::Builder::Association
 
     def build
@@ -39,7 +22,7 @@ module Bsm::Model::HasManySerialized
     protected
 
       def serialize_attribute
-        model.serialize attribute_name, Coder.new
+        model.serialize attribute_name, ::Bsm::Model::Coders::JsonColumn.new(Array)
       end
 
       def define_readers
@@ -63,11 +46,11 @@ module Bsm::Model::HasManySerialized
             next if record.is_a?(klass)
             raise ActiveRecord::AssociationTypeMismatch, "#{klass.name} expected, got #{record.class}"
           end
-          write_attribute attribute_name, records.map(&:id)
+          write_attribute attribute_name, records.map(&:id).sort
         end
 
         model.redefine_method("#{attribute_name}=") do |values|
-          send "#{name}=", klass.where(klass.primary_key => Array.wrap(values)).select(:id).to_a
+          send "#{name}=", klass.where(klass.primary_key => Array.wrap(values)).select(:id).to_a.sort
         end
       end
 

data/lib/bsm/model/sti_convertable.rb

@@ -20,7 +20,7 @@ module Bsm::Model::StiConvertable
       klass = real_descendants.find {|k| k.kind == kind } || fallback_descendant
       return super if klass == self
 
-      klass.with_scope(respond_to?(:current_scope) ? current_scope : current_scoped_methods) do # AR 3.0 compatibility
+      klass.with_scope(methods.include?(:current_scope) ? current_scope : current_scoped_methods) do # AR 3.0 compatibility
         klass.new(attributes, *args, &block)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bsm-models
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract
@@ -113,20 +113,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/bsm/model/coders/json_column.rb
-- lib/bsm/model/coders/marshal_column.rb
-- lib/bsm/model/coders/abstract_column.rb
-- lib/bsm/model/abstract.rb
+- lib/bsm/model.rb
+- lib/bsm/model/editable.rb
 - lib/bsm/model/locale/en.yml
-- lib/bsm/model/deletable.rb
+- lib/bsm/model/abstract.rb
 - lib/bsm/model/coders.rb
-- lib/bsm/model/has_many_serialized.rb
+- lib/bsm/model/deletable.rb
 - lib/bsm/model/eager_descendants.rb
+- lib/bsm/model/has_many_serialized.rb
 - lib/bsm/model/sti_convertable.rb
-- lib/bsm/model/editable.rb
-- lib/bsm/model.rb
-- lib/bsm_models.rb
+- lib/bsm/model/coders/marshal_column.rb
+- lib/bsm/model/coders/abstract_column.rb
+- lib/bsm/model/coders/json_column.rb
 - lib/bsm-models.rb
+- lib/bsm_models.rb
 homepage: https://github.com/bsm/models
 licenses: []
 post_install_message: 
@@ -147,8 +147,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: BSM's very custom model extensions
 test_files: []
+has_rdoc: