serialization_scopes 0.1.2 → 0.2.0

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem "activerecord", '< 3.0.0'
-gem "rspec"
+gem "activerecord", '>= 3.0.0.rc'
+gem "rspec", ">= 2.0.0.beta.17"
 gem "rake"
 gem "jeweler"

data/Gemfile.lock

@@ -1,26 +1,46 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (2.3.8)
-      activesupport (= 2.3.8)
-    activesupport (2.3.8)
+    activemodel (3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      arel (~> 0.4.0)
+      tzinfo (~> 0.3.22)
+    activesupport (3.0.0.rc)
+    arel (0.4.0)
+      activesupport (>= 3.0.0.beta)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
     gemcutter (0.6.1)
     git (1.2.5)
+    i18n (0.4.1)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
     rake (0.8.7)
-    rspec (1.3.0)
+    rspec (2.0.0.beta.19)
+      rspec-core (= 2.0.0.beta.19)
+      rspec-expectations (= 2.0.0.beta.19)
+      rspec-mocks (= 2.0.0.beta.19)
+    rspec-core (2.0.0.beta.19)
+    rspec-expectations (2.0.0.beta.19)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.19)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
+    tzinfo (0.3.22)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (< 3.0.0)
+  activerecord (>= 3.0.0.rc)
   jeweler
   rake
-  rspec
+  rspec (>= 2.0.0.beta.17)

data/Rakefile

@@ -2,13 +2,10 @@ require 'bundler'
 Bundler.setup
 
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/mocks/version'
+require 'rspec/core/rake_task'
 
-desc 'Run specs.'
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["-c"]
-end
+RSpec::Core::RakeTask.new(:spec)
 
 desc 'Default: run specs.'
 task :default => :spec
@@ -22,7 +19,7 @@ begin
     gemspec.email = "dimitrij@blacksquaremedia.com"
     gemspec.homepage = "http://github.com/dim/serialization_scopes"
     gemspec.authors = ["Dimitrij Denissenko"]
-    gemspec.add_runtime_dependency "activerecord", ">= 2.3.0", '< 3.0.0'
+    gemspec.add_runtime_dependency "activerecord", "> 2.5.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/serialization_scopes.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{serialization_scopes}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dimitrij Denissenko"]
@@ -23,8 +23,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/serialization_scopes.rb",
-     "lib/serialization_scopes/matchers.rb",
-     "lib/serialization_scopes/matchers/serialize_matcher.rb",
      "rails/init.rb",
      "serialization_scopes.gemspec",
      "spec/helper.rb",
@@ -45,12 +43,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.0", "< 3.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, ["> 2.5.0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 2.3.0", "< 3.0.0"])
+      s.add_dependency(%q<activerecord>, ["> 2.5.0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 2.3.0", "< 3.0.0"])
+    s.add_dependency(%q<activerecord>, ["> 2.5.0"])
   end
 end
 

data/spec/helper.rb

@@ -1,12 +1,26 @@
 ENV["RAILS_ENV"] ||= 'test'
-$: << File.join(File.dirname(__FILE__),'..', 'lib')
+$:.unshift File.dirname(__FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'rubygems'
-require 'active_record'
 
-require File.join(File.dirname(__FILE__),'..', 'rails', 'init.rb')
-require 'spec/autorun'
-require 'spec/mocks'
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end
+
+require 'active_record'
+require 'serialization_scopes'
+require 'rspec'
 
-ActiveRecord::Base.stub(:establish_connection)
+RSpec.configure do |c|
+  c.mock_with :rspec
+end
 
+ActiveRecord::Base.include_root_in_json = false

data/spec/serialization_scopes_spec.rb

@@ -2,9 +2,14 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe SerializationScopes do
 
+  before do
+    ActiveRecord::Base.stub!(:establish_connection)
+  end
+
   class SomeModel < ActiveRecord::Base
     serialization_scope :default, :only => [:id, :name], :methods => :currency
     serialization_scope :admin, :only => [:id, :secret]
+    after_initialize    :set_defaults
 
     def self.columns
       @columns ||= [
@@ -14,7 +19,7 @@ describe SerializationScopes do
       ]
     end
 
-    def after_initialize
+    def set_defaults
       self.id     = 1
       self.name   = 'Any'
       self.secret = 'key'
@@ -28,8 +33,8 @@ describe SerializationScopes do
   it 'should constraint to_xml' do
     SomeModel.new.to_xml.should == %(<?xml version="1.0" encoding="UTF-8"?>
 <some-model>
-  <id type="integer">1</id>
   <name>Any</name>
+  <id type="integer">1</id>
   <currency>USD</currency>
 </some-model>
 )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: serialization_scopes
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -22,22 +22,14 @@ dependencies:
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
         - 2
-        - 3
-        - 0
-        version: 2.3.0
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
+        - 5
         - 0
-        version: 3.0.0
+        version: 2.5.0
   requirement: *id001
   prerelease: false
   type: :runtime
@@ -58,8 +50,6 @@ files:
 - Rakefile
 - VERSION
 - lib/serialization_scopes.rb
-- lib/serialization_scopes/matchers.rb
-- lib/serialization_scopes/matchers/serialize_matcher.rb
 - rails/init.rb
 - serialization_scopes.gemspec
 - spec/helper.rb

data/lib/serialization_scopes/matchers/serialize_matcher.rb

@@ -1,99 +0,0 @@
-module SerializationScopes # :nodoc:
-  module Shoulda # :nodoc:
-    module Matchers
-
-      # Ensures that records are serialized correctly
-      #
-      # Example:
-      #   describe Article do
-      #     it { should serialize }
-      #     it { should serialize.to(:article) }
-      #     it { should serialize.to(:article).with_attributes(6) }
-      #     it { should serialize.for(:reader).to(:article).with_attributes(4) }
-      #   end
-      def serialize
-        SerializeMatcher.new
-      end
-
-      class SerializeMatcher
-
-        def for(scope)
-          @scope = scope
-          self
-        end
-
-        def to(value)
-          @to = value
-          self
-        end
-
-        def with_attributes(count)
-          @count = count
-          self
-        end
-
-        def matches?(subject)
-          @subject = subject
-          @subject.id ||= rand(10000000)
-          correct_root? && correct_column_count?
-        end
-
-        attr_reader :failure_message, :negative_failure_message
-
-        def description
-          result = "serialize"
-          result << " with #{@scope.inspect} scope" unless @scope.nil?
-          result << " to #{@to.inspect}" unless @to.nil?
-          result << " with #{@count} attributes" unless @count.nil?
-          result
-        end
-
-        def failure_message
-          "Expected #{expectation}"
-        end
-
-        def negative_failure_message
-          "Did not expect #{expectation}"
-        end
-
-        private
-
-          def root_name
-            serialized.keys.first
-          end
-
-          def attributes
-            serialized[root_name] ? serialized[root_name].keys : []
-          end
-
-          def serialized
-            @serialized ||= ActiveSupport::JSON.decode(@subject.to_json(:scope => @scope))
-          end
-
-          def expectation
-            result = "to #{description}"
-            result << ", but #{failure_description}"
-            result
-          end
-
-          def correct_root?
-            @to.nil? || @to == root_name
-          end
-
-          def correct_column_count?
-            @count.nil? || @count == attributes.size
-          end
-
-          def failure_description
-            if !correct_root?
-              "root was #{root_name.inspect}"
-            elsif !correct_column_count?
-              "#{attributes.size} attributes were created (#{attributes.map(&:to_s).sort.join(', ')})"
-            end
-          end
-
-      end
-
-    end
-  end
-end

data/lib/serialization_scopes/matchers.rb

@@ -1,8 +0,0 @@
-require 'serialization_scopes/matchers/serialize_matcher'
-
-module SerializationScopes
-  module Shoulda
-    module Matchers
-    end
-  end
-end