stratify-base 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,52 +1,53 @@
 PATH
   remote: .
   specs:
-    stratify-base (0.1.3)
-      bson_ext (~> 1.3.1)
-      mongoid (~> 2.0.2)
+    stratify-base (0.1.4)
+      bson_ext (~> 1.6.0)
+      mongoid (~> 2.4.0)
       tilt (~> 1.3.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
+    activesupport (3.2.3)
       i18n (~> 0.6)
-    activesupport (3.1.0)
       multi_json (~> 1.0)
-    bcrypt-ruby (3.0.0)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bson (1.6.2)
+    bson_ext (1.6.2)
+      bson (~> 1.6.2)
     builder (3.0.0)
-    database_cleaner (0.6.7)
-    diff-lcs (1.1.2)
+    database_cleaner (0.7.2)
+    diff-lcs (1.1.3)
     i18n (0.6.0)
     mocha (0.9.12)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mongoid (2.0.2)
-      activemodel (~> 3.0)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.9)
+      activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    multi_json (1.0.3)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.3)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    multi_json (1.3.2)
+    rake (0.9.2.2)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     tilt (1.3.3)
-    tzinfo (0.3.29)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  database_cleaner (~> 0.6.7)
+  database_cleaner (~> 0.7.2)
   mocha (~> 0.9.12)
-  rspec (~> 2.6.0)
+  rake (~> 0.9.2)
+  rspec (~> 2.9.0)
   stratify-base!

data/LICENSE

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -5,7 +5,7 @@
 Stratify is developed and tested with the following dependencies.
 
 * Ruby 1.9.2 (See `.rvmrc` for the specific version.)
-* MongoDB 1.8
+* MongoDB 2.0
 
 ## Development
 

data/Rakefile

@@ -7,4 +7,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task :default => :spec

data/lib/stratify/activity.rb

@@ -10,7 +10,7 @@ module Stratify
     include Renderable
 
     store_in :activities
-    
+
     field :source, :type => String
     field :created_at, :type => DateTime
 

data/lib/stratify/archiver.rb

@@ -3,7 +3,7 @@ require 'stratify/logger'
 module Stratify
   class Archiver
     attr_reader :collector
-  
+
     def initialize(collector)
       @collector = collector
     end
@@ -28,18 +28,18 @@ module Stratify
     end
 
     def persist_activity(activity)
-      # Since we run the collectors frequently, it is very common to encounter 
+      # Since we run the collectors frequently, it is very common to encounter
       # objects that we have already imported.  If this activity is a duplicate
       # of an existing object, then we skip importing this activity.
-      return if activity.duplicate? 
+      return if activity.duplicate?
 
       unless activity.save
         Stratify.logger.error("Failed to persist activity: #{activity}.\nValidation errors: #{activity.errors}")
       end
     end
-  
+
     def record_collection_statistics
       collector.update_attribute :last_ran_at, Time.now
     end
   end
-end
+end

data/lib/stratify/collector.rb

@@ -7,7 +7,7 @@ module Stratify
     include Mongoid::Document
 
     store_in :collectors
-  
+
     field :last_ran_at, :type => DateTime
 
     def self.configuration_fields(fields_hash = nil)
@@ -32,7 +32,7 @@ module Stratify
       return nil if configuration_fields.empty?
       read_attribute(configuration_fields.first.name)
     end
-  
+
     def run
       Archiver.new(self).run
     end
@@ -62,14 +62,14 @@ module Stratify
     class << self
       attr_reader :collector_classes
     end
-  
+
     @collector_classes = []
-  
+
     def self.inherited(subclass)
       super
       Collector.collector_classes << subclass
     end
-  
+
     def self.collector_class_for(source)
       Collector.collector_classes.find {|clazz| clazz.source == source}
     end
@@ -86,10 +86,10 @@ module Stratify
       fields_hash.map do |f|
         name = f[0]
         attributes = f[1]
-        Stratify::FieldDefinition.new(name, attributes) 
+        Stratify::FieldDefinition.new(name, attributes)
       end
     end
-  
+
     def self.apply_fields_to_class(field_definitions)
       field_definitions.each do |field|
         field field.name

data/lib/stratify/collector_coordinator.rb

@@ -10,4 +10,4 @@ module Stratify
       end
     end
   end
-end
+end

data/lib/stratify/logger.rb

@@ -5,10 +5,10 @@ module Stratify
     end
 
     private
-    
+
     def initialize_logger
       return Rails.logger if defined?(Rails)
       Logger.new(STDOUT)
-    end    
+    end
   end
 end

data/lib/stratify/mongoid_extension.rb

@@ -8,7 +8,7 @@ module Stratify
           @natural_key_fields = fields.dup
           validates_uniqueness_of_natural_key
         end
-        
+
         def validates_uniqueness_of_natural_key
           first, *rest = *natural_key_fields
           if rest.empty?

data/lib/stratify/renderable.rb

@@ -21,17 +21,17 @@ module Stratify
         :erb
       end
     end
-    
+
     def to_html
       template_handler = Tilt[self.class.template_format].new { self.class.template.strip }
       template_handler.render(presenter)
     end
 
     # Returns the object that will be passed to the template for rendering.
-    # 
+    #
     # The default implementation returns 'self' (i.e., the renderable object).
     #
-    # Subclasses may optionally override this method to provide an object 
+    # Subclasses may optionally override this method to provide an object
     # better suited for use in rendering (e.g., an object implementing the
     # presenter pattern).
     def presenter

data/lib/stratify/version.rb

@@ -1,5 +1,5 @@
 module Stratify
   module Base
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/spec/prototypes/bacon.rb

@@ -1,12 +1,12 @@
 # This file defines an example Stratify collector and activity for testing
-# purposes.  
-# 
-# Stratify::Bacon::Activity and Stratify::Bacon::Collector represent a 
-# (fictitious, unfortunately) service for tracking your bacon-related 
-# achievements. This also happens to be an *amazing* idea for a service. 
+# purposes.
+#
+# Stratify::Bacon::Activity and Stratify::Bacon::Collector represent a
+# (fictitious, unfortunately) service for tracking your bacon-related
+# achievements. This also happens to be an *amazing* idea for a service.
 # You know you want to track your bacon-related achievements. You just know it.
 
-# Stratify::Bacon::Activity implements all *mandatory* functionality required 
+# Stratify::Bacon::Activity implements all *mandatory* functionality required
 # for it to be a valid activity.
 module Stratify
   module Bacon
@@ -20,7 +20,7 @@ module Stratify
   end
 end
 
-# Stratify::Bacon::Collector implements all *mandatory* functionality required 
+# Stratify::Bacon::Collector implements all *mandatory* functionality required
 # for it to be a valid collector.
 module Stratify
   module Bacon
@@ -30,9 +30,9 @@ module Stratify
       configuration_fields :username => {:type => :string},
                            :password => {:type => :password}
 
-      # Return a fixed set of Stratify::Bacon::Activity objects.  (A real 
-      # collector would tend to return new data as time goes by.  For testing 
-      # purposes, it's convenient to have a fixed set of data returned by the 
+      # Return a fixed set of Stratify::Bacon::Activity objects.  (A real
+      # collector would tend to return new data as time goes by.  For testing
+      # purposes, it's convenient to have a fixed set of data returned by the
       # collector.)
       def activities
         [
@@ -43,4 +43,4 @@ module Stratify
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ RSpec.configure do |config|
   DatabaseCleaner.orm = "mongoid"
   config.before(:each, :database => true) do
     DatabaseCleaner.clean
-  end    
+  end
 
   config.before(:suite) do
     silence_mongoid_logging
@@ -45,4 +45,4 @@ end
 def initialize_mongoid_configuration
   mongoid_config = YAML::load_file(File.join(File.dirname(__FILE__), "mongoid.yml"))
   Mongoid.from_hash(mongoid_config)
-end
+end

data/spec/stratify/activity_spec.rb

@@ -13,23 +13,23 @@ describe Stratify::Activity do
       activity.created_on.should be_nil
     end
   end
-  
+
   describe "#delete", :database => true do
     it "soft-deletes the activity" do
       creation_time = Time.now
       activity = Stratify::Bacon::Activity.create!(:slices => 42, :created_at => creation_time)
       activity.delete
-      
+
       Stratify::Bacon::Activity.where(:slices => 42, :created_at => creation_time).should_not exist
       Stratify::Bacon::Activity.deleted.where(:slices => 42, :created_at => creation_time).should exist
     end
   end
-  
+
   describe "#duplicate?", :database => true do
     class ActivityForTestingDuplicates < Stratify::Activity
       field :foo
       field :bar
-      
+
       natural_key :foo, :bar
     end
 
@@ -47,7 +47,7 @@ describe Stratify::Activity do
       original = ActivityForTestingDuplicates.new(:foo => "a", :bar => "b", :created_at => Time.now)
       original.save!
       original.delete
-      
+
       ActivityForTestingDuplicates.new(:foo => "a", :bar => "b").should be_duplicate
     end
   end

data/spec/stratify/archiver_spec.rb

@@ -19,7 +19,7 @@ describe Stratify::Archiver do
     context "when an exception occurs during collection" do
       it "propagates the exception to the caller" do
         archiver = Stratify::Archiver.new(collector = stub)
-        archiver.stubs(:collect_activities).raises("some gnarly error") 
+        archiver.stubs(:collect_activities).raises("some gnarly error")
         lambda { archiver.run }.should raise_error
       end
 
@@ -29,13 +29,13 @@ describe Stratify::Archiver do
 
         collector = Stratify::Collector.create
         archiver = Stratify::Archiver.new(collector)
-        archiver.stubs(:collect_activities).raises("some gnarly error") 
+        archiver.stubs(:collect_activities).raises("some gnarly error")
         archiver.run rescue nil
         collector.last_ran_at.should == stub_current_timestamp
       end
     end
   end
-  
+
   describe ".collect_activities" do
     it "documents the source of each activity" do
       example_collector_class = Class.new(Stratify::Collector)
@@ -44,18 +44,18 @@ describe Stratify::Archiver do
 
       activity = Stratify::Activity.new
       collector.stubs(:activities).returns [activity]
-      
+
       archiver = Stratify::Archiver.new(collector)
       archiver.stubs(:persist_activity)
       archiver.send(:collect_activities)
       activity.source.should == "some-example-source"
     end
-    
+
     it "persists each activity" do
       collector = Stratify::Collector.new
       activity = Stratify::Activity.new
       collector.stubs(:activities).returns [activity]
-      
+
       archiver = Stratify::Archiver.new(collector)
       archiver.expects(:persist_activity).with(activity)
       archiver.send(:collect_activities)
@@ -82,4 +82,4 @@ describe Stratify::Archiver do
     end
   end
 
-end
+end

data/spec/stratify/collector_coordinator_spec.rb

@@ -6,28 +6,28 @@ describe Stratify::CollectorCoordinator do
     it "runs all collectors" do
       collector_1 = mock(:run)
       collector_2 = mock(:run)
-      
+
       Stratify::Collector.stubs(:all).returns([collector_1, collector_2])
 
       Stratify::CollectorCoordinator.run_all
     end
-    
+
     context "when an exception occurs in a collector" do
       it "logs the exception" do
         collector = stub
-        collector.stubs(:run).raises("some gnarly error") 
+        collector.stubs(:run).raises("some gnarly error")
         Stratify::Collector.stubs(:all).returns([collector])
-        
+
         Stratify.logger.expects(:error).with() { |value| value.include? "some gnarly error" }
         Stratify::CollectorCoordinator.run_all
       end
-      
+
       it "runs the remaining collectors" do
         silence_stratify_logging # Silence the logger so as not to clutter the test output
 
         troublesome_collector = stub
-        troublesome_collector.stubs(:run).raises("some gnarly error") 
-        
+        troublesome_collector.stubs(:run).raises("some gnarly error")
+
         other_collector = mock
         other_collector.expects(:run).returns(nil)
 

data/spec/stratify/collector_spec.rb

@@ -25,13 +25,13 @@ describe Stratify::Collector do
 
   describe ".sources" do
     before { Stratify::Collector.collector_classes.clear }
-    
+
     it "returns the list of sources for all collectors" do
       anonymous_collector_subclass.source("FourSquare")
       anonymous_collector_subclass.source("Twitter")
       Stratify::Collector.sources.should =~ ["FourSquare", "Twitter"]
     end
-    
+
     it "returns the sources in case-insensitive alphabetical order" do
       anonymous_collector_subclass.source("Twitter")
       anonymous_collector_subclass.source("iTunes")
@@ -47,18 +47,18 @@ describe Stratify::Collector do
       fields.find {|f| f.name == :username && f.type == :string}.should be
       fields.find {|f| f.name == :password && f.type == :password}.should be
     end
-    
+
     it "registers the given fields with Mongoid" do
       TestCollector.fields.should include("username", "password")
     end
-    
+
     describe "influences validation" do
       it "adds an error when a collector instance fails to provide a value for each field" do
         collector = TestCollector.new
         collector.should_not be_valid
         collector.errors[:username].should include("can't be blank")
       end
-    
+
       it "adds NO errors when a collector instance provides a value for each field" do
         collector = TestCollector.new(:username => "foo")
         collector.valid?
@@ -78,7 +78,7 @@ describe Stratify::Collector do
       anonymous_collector_subclass.configuration_instructions.should == nil
     end
   end
-  
+
   describe "#configuration_instructions (instance method)" do
     it "returns the configuration instructions defined in the class" do
       collector_subclass = anonymous_collector_subclass
@@ -87,7 +87,7 @@ describe Stratify::Collector do
       collector.configuration_instructions.should == "Provide your username and ..."
     end
   end
-  
+
   describe "#configuration_summary" do
     context "when the collector's class has one configuration field" do
       it "returns the value of the field" do
@@ -121,5 +121,5 @@ describe Stratify::Collector do
       end
     end
   end
-  
+
 end

data/spec/stratify/integration_spec.rb

@@ -10,13 +10,13 @@ describe "collecting activities", :database => true do
     Stratify::Bacon::Activity.where(:slices => 5, :created_at => Time.new(2011, 4, 7, 8, 17)).should exist
     Stratify::Bacon::Activity.where(:slices => 4, :created_at => Time.new(2011, 4, 9, 6, 24)).should exist
   end
-  
+
   it "does not import duplicate activities" do
     collector = Stratify::Bacon::Collector.new(:username => "johndoe", :password => "secret")
     expect { collector.run }.to change(Stratify::Bacon::Activity, :count).by(3)
     expect { collector.run }.to change(Stratify::Bacon::Activity, :count).by(0)
   end
-  
+
   it "does not re-import soft-deleted activities" do
     collector = Stratify::Bacon::Collector.new(:username => "johndoe", :password => "secret")
 
@@ -24,7 +24,7 @@ describe "collecting activities", :database => true do
     activity = Stratify::Bacon::Activity.where(:created_at => Time.new(2011, 4, 3, 7, 2)).first
     activity.should be
     activity.delete
-    
+
     collector.run
     Stratify::Bacon::Activity.where(:created_at => Time.new(2011, 4, 3, 7, 2)).should_not exist
   end

data/spec/stratify/mongoid_extension_spec.rb

@@ -27,7 +27,7 @@ describe Stratify::MongoidExtension::NaturalKey do
         klass.natural_key_fields.should == [:url, :created_at]
       end
     end
-    
+
     it "declares a uniqueness validator for the natural key" do
       klass = class_with_natural_key_mixin
       klass.expects(:validates_uniqueness_of_natural_key)
@@ -63,7 +63,7 @@ describe Stratify::MongoidExtension::NaturalKey do
       end
     end
   end
-  
+
   describe "#natural_key_hash" do
     it "returns the field name and value for the object's natural key" do
       klass = class_with_natural_key_mixin do |k|

data/spec/stratify/renderable_spec.rb

@@ -27,7 +27,7 @@ describe Stratify::Renderable do
       renderable_class.template_format.should == :haml
     end
   end
-  
+
   describe "#presenter" do
     it "returns the object" do
       renderable_object = anonymous_class_with_renderable_mixin.new
@@ -46,7 +46,7 @@ describe Stratify::Renderable do
           "Kilgore"
         end
       end
-      
+
       renderable_object.to_html.should == "Hello, Kilgore"
     end
   end

data/stratify-base.gemspec

@@ -19,11 +19,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "bson_ext", "~> 1.3.1"
-  s.add_runtime_dependency "mongoid", "~> 2.0.2"
+  s.add_runtime_dependency "bson_ext", "~> 1.6.0"
+  s.add_runtime_dependency "mongoid", "~> 2.4.0"
   s.add_runtime_dependency "tilt", "~> 1.3.2"
-  
-  s.add_development_dependency "rspec", "~> 2.6.0"
+
+  s.add_development_dependency "rake", "~> 0.9.2"
+  s.add_development_dependency "rspec", "~> 2.9.0"
   s.add_development_dependency "mocha", "~> 0.9.12"
-  s.add_development_dependency "database_cleaner", "~> 0.6.7"
+  s.add_development_dependency "database_cleaner", "~> 0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stratify-base
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2012-04-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70235604669540 !ruby/object:Gem::Requirement
+  requirement: &70298565382900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70235604669540
+  version_requirements: *70298565382900
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70235604739260 !ruby/object:Gem::Requirement
+  requirement: &70298565382260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70235604739260
+  version_requirements: *70298565382260
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70235608817580 !ruby/object:Gem::Requirement
+  requirement: &70298565381760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,32 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70235608817580
+  version_requirements: *70298565381760
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70298565381240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *70298565381240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70235613372040 !ruby/object:Gem::Requirement
+  requirement: &70298565380760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70235613372040
+  version_requirements: *70298565380760
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70235621304580 !ruby/object:Gem::Requirement
+  requirement: &70298565380280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,18 +76,18 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70235621304580
+  version_requirements: *70298565380280
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70235621488640 !ruby/object:Gem::Requirement
+  requirement: &70298565379820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70235621488640
+  version_requirements: *70298565379820
 description: Provides the infrastructure to support the development and use of Stratify
   collectors and activities
 email: