jm81-dm-svn 0.1.0 → 0.2.0

data/.gitignore

@@ -19,4 +19,5 @@ src/*
 .project
 .loadpath
 lib/wistle/tmp/*
-config/recaptcha.yml
+config/recaptcha.yml
+*qt_temp*

data/Rakefile

@@ -9,9 +9,9 @@ begin
     gem.email = "jmorgan@morgancreative.net"
     gem.homepage = "http://github.com/jm81/dm-svn"
     gem.authors = ["Jared Morgan"]
-    gem.add_dependency('dm-core')
-    gem.add_dependency('dm-aggregates')
-    gem.add_dependency('dm-validations')
+    gem.add_dependency('dm-core', '>= 0.10.0')
+    gem.add_dependency('dm-aggregates', '>= 0.10.0')
+    gem.add_dependency('dm-validations', '>= 0.10.0')
     gem.add_dependency('jm81-svn-fixture', '>= 0.1.1')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/dm-svn.gemspec

@@ -0,0 +1,82 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-svn}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jared Morgan"]
+  s.date = %q{2009-09-19}
+  s.email = %q{jmorgan@morgancreative.net}
+  s.files = [
+    ".gitignore",
+     "Rakefile",
+     "VERSION",
+     "dm-svn.gemspec",
+     "lib/dm-svn.rb",
+     "lib/dm-svn/config.rb",
+     "lib/dm-svn/model.rb",
+     "lib/dm-svn/svn.rb",
+     "lib/dm-svn/svn/categorized.rb",
+     "lib/dm-svn/svn/changeset.rb",
+     "lib/dm-svn/svn/node.rb",
+     "lib/dm-svn/svn/sync.rb",
+     "spec/dm-svn/config_spec.rb",
+     "spec/dm-svn/database.yml",
+     "spec/dm-svn/fixtures/articles_comments.rb",
+     "spec/dm-svn/mock_models.rb",
+     "spec/dm-svn/model_spec.rb",
+     "spec/dm-svn/spec_helper.rb",
+     "spec/dm-svn/svn/categorized_spec.rb",
+     "spec/dm-svn/svn/changeset_spec.rb",
+     "spec/dm-svn/svn/node_spec.rb",
+     "spec/dm-svn/svn/sync_spec.rb",
+     "spec/dm-svn/svn_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/jm81/dm-svn}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Sync content from a Subversion repository to a DataMapper model}
+  s.test_files = [
+    "spec/dm-svn/config_spec.rb",
+     "spec/dm-svn/fixtures/articles_comments.rb",
+     "spec/dm-svn/mock_models.rb",
+     "spec/dm-svn/model_spec.rb",
+     "spec/dm-svn/spec_helper.rb",
+     "spec/dm-svn/svn/categorized_spec.rb",
+     "spec/dm-svn/svn/changeset_spec.rb",
+     "spec/dm-svn/svn/node_spec.rb",
+     "spec/dm-svn/svn/sync_spec.rb",
+     "spec/dm-svn/svn_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, [">= 0.10.0"])
+      s.add_runtime_dependency(%q<dm-aggregates>, [">= 0.10.0"])
+      s.add_runtime_dependency(%q<dm-validations>, [">= 0.10.0"])
+      s.add_runtime_dependency(%q<jm81-svn-fixture>, [">= 0.1.1"])
+    else
+      s.add_dependency(%q<dm-core>, [">= 0.10.0"])
+      s.add_dependency(%q<dm-aggregates>, [">= 0.10.0"])
+      s.add_dependency(%q<dm-validations>, [">= 0.10.0"])
+      s.add_dependency(%q<jm81-svn-fixture>, [">= 0.1.1"])
+    end
+  else
+    s.add_dependency(%q<dm-core>, [">= 0.10.0"])
+    s.add_dependency(%q<dm-aggregates>, [">= 0.10.0"])
+    s.add_dependency(%q<dm-validations>, [">= 0.10.0"])
+    s.add_dependency(%q<jm81-svn-fixture>, [">= 0.1.1"])
+  end
+end

data/lib/dm-svn.rb

@@ -5,8 +5,9 @@ require 'dm-validations'
 require 'svn/client'
 
 module DmSvn
+  VERSION = '0.2.0'
 end
 
-%w{config svn model}.each do |f|
-  require File.expand_path(File.dirname(__FILE__) + "/dm-svn/#{f}.rb")
-end
+require 'dm-svn/config'
+require 'dm-svn/svn'
+require 'dm-svn/model'

data/lib/dm-svn/model.rb

@@ -2,7 +2,7 @@ module DmSvn
   class Model
     include DataMapper::Resource
   
-    property :id, Integer, :serial => true
+    property :id, Serial
     property :name, String
     property :revision, Integer
     

data/lib/dm-svn/svn.rb

@@ -140,5 +140,5 @@ module DmSvn
 end
 
 %w{sync changeset node categorized}.each do |f|
-  require File.dirname(__FILE__) + "/svn/#{f}.rb"
-end
+  require "dm-svn/svn/#{f}"
+end

data/lib/dm-svn/svn/sync.rb

@@ -34,13 +34,13 @@ module DmSvn
           c.process
           # Update model_row.revision
           row_update = @model_row.class.get(@model_row.id)
-          row_update.update_attributes(:revision => c.revision)
+          row_update.update(:revision => c.revision)
         end
         
         # Ensure that @model_row.revision is now set to the latest (even if there
         # weren't applicable changes in the latest revision).
         row_update = @model_row.class.get(@model_row.id)
-        row_update.update_attributes(:revision => @repos.latest_revnum)
+        row_update.update(:revision => @repos.latest_revnum)
         return true
       end
       

data/spec/dm-svn/config_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "spec_helper" )
+require 'spec_helper'
 
 describe DmSvn::Config do
   before(:each) do

data/spec/dm-svn/mock_models.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'dm-svn'
+
+class MockArticle
+  include DataMapper::Resource
+  include DmSvn::Svn
+  
+  property :id, Serial
+  property :title, String
+  property :contents, Text, :body_property => true
+end
+
+class MockArticleNoSvn
+  include DataMapper::Resource
+  
+  property :id, Serial
+  property :title, String
+  property :contents, Text
+end
+
+class MockSyncModel
+  include DataMapper::Resource
+  include DmSvn::Svn
+  
+  property :id, Serial
+  property :title, String
+  property :body, Text, :body_property => true
+  property :published_at, DateTime
+  property :random_number, Integer # because some tests need a non-datetime prop
+end
+
+class MockCategory
+  include DataMapper::Resource
+  include DmSvn::Svn
+  has n, :mock_categorized_articles
+  
+  property :id, Serial
+  property :title, String
+  property :random_number, Integer
+end
+
+class MockCategorizedArticle
+  include DataMapper::Resource
+  include DmSvn::Svn
+  belongs_to :mock_category, :svn => true
+  
+  property :id, Serial
+  property :title, String
+  property :article, String
+  property :body, Text, :body_property => true
+  property :published_at, DateTime
+  property :random_number, Integer # because some tests need a non-datetime prop
+end

data/spec/dm-svn/model_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "spec_helper" )
+require 'spec_helper'
 
 describe DmSvn::Model do
 

data/spec/dm-svn/spec_helper.rb

@@ -1,6 +1,3 @@
-require File.expand_path(File.join( File.dirname(__FILE__), "..", "spec_helper" ))
-require File.expand_path(File.join( File.dirname(__FILE__), "..", "..", "lib", "dm-svn.rb" ))
-
 class MockArticle
   include DataMapper::Resource
   include DmSvn::Svn

data/spec/dm-svn/svn/categorized_spec.rb

@@ -1,4 +1,5 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
+require 'dm-svn/mock_models'
 
 describe DmSvn::Svn::Categorized do
   before(:all) do

data/spec/dm-svn/svn/changeset_spec.rb

@@ -1,4 +1,5 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
+require 'dm-svn/mock_models'
 
 describe DmSvn::Svn::Changeset do
   before(:all) do

data/spec/dm-svn/svn/node_spec.rb

@@ -1,4 +1,5 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
+require 'dm-svn/mock_models'
 
 describe DmSvn::Svn::Node do
   before(:all) do

data/spec/dm-svn/svn/sync_spec.rb

@@ -1,4 +1,5 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
+require 'dm-svn/mock_models'
 
 describe DmSvn::Svn::Sync do
   after(:all) do

data/spec/dm-svn/svn_spec.rb

@@ -1,4 +1,5 @@
-require File.join( File.dirname(__FILE__), "spec_helper" )
+require 'spec_helper'
+require 'dm-svn/mock_models'
 
 describe DmSvn::Svn do
   before(:all) do
@@ -13,7 +14,7 @@ describe DmSvn::Svn do
   it "should add svn_* properties" do
     fields = %w{name created_at updated_at created_rev updated_rev created_by updated_by}
     fields.each do | field |
-      lambda { MockArticleNoSvn.properties["svn_#{field}"] }.should raise_error(ArgumentError)
+      MockArticleNoSvn.properties["svn_#{field}"].should be_nil
       MockArticle.properties["svn_#{field}"].should be_kind_of(DataMapper::Property)
     end
   end
@@ -53,7 +54,7 @@ describe DmSvn::Svn do
     end
     
     it 'should update path, body and other properties' do
-      @node.should_receive(:body).twice.and_return('body')      
+      @node.should_receive(:body).twice.and_return('body')
       @node.should_receive(:short_path).and_return('short/path')
       @node.should_receive(:properties).and_return(
         {'title' => 'Title', 'svn_updated_by' => 'jmorgan'}
@@ -61,8 +62,8 @@ describe DmSvn::Svn do
       
       @article.should_receive(:attribute_set).with(:svn_name, 'short/path')
       @article.should_receive(:attribute_set).with('contents', 'body')
-      @article.should_receive(:attribute_set).with(:title, 'Title')
-      @article.should_receive(:attribute_set).with(:svn_updated_by, 'jmorgan')
+      @article.should_receive(:title=).with('Title')
+      @article.should_receive(:svn_updated_by=).with('jmorgan')
       
       @article.should_receive(:save)
       @article.update_from_svn(@node)

data/spec/spec_helper.rb

@@ -1,7 +1,4 @@
 require 'spec'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'dm-svn'
 
 gem 'jm81-svn-fixture'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jm81-dm-svn
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -07:00
+date: 2009-09-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.10.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-aggregates
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.10.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-validations
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.10.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: jm81-svn-fixture
@@ -64,6 +64,7 @@ files:
 - .gitignore
 - Rakefile
 - VERSION
+- dm-svn.gemspec
 - lib/dm-svn.rb
 - lib/dm-svn/config.rb
 - lib/dm-svn/model.rb
@@ -75,8 +76,7 @@ files:
 - spec/dm-svn/config_spec.rb
 - spec/dm-svn/database.yml
 - spec/dm-svn/fixtures/articles_comments.rb
-- spec/dm-svn/fixtures/fiction_site.rb
-- spec/dm-svn/fixtures/news_site.rb
+- spec/dm-svn/mock_models.rb
 - spec/dm-svn/model_spec.rb
 - spec/dm-svn/spec_helper.rb
 - spec/dm-svn/svn/categorized_spec.rb
@@ -86,8 +86,9 @@ files:
 - spec/dm-svn/svn_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/jm81/dm-svn
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -108,15 +109,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Sync content from a Subversion repository to a DataMapper model
 test_files: 
 - spec/dm-svn/config_spec.rb
 - spec/dm-svn/fixtures/articles_comments.rb
-- spec/dm-svn/fixtures/fiction_site.rb
-- spec/dm-svn/fixtures/news_site.rb
+- spec/dm-svn/mock_models.rb
 - spec/dm-svn/model_spec.rb
 - spec/dm-svn/spec_helper.rb
 - spec/dm-svn/svn/categorized_spec.rb

data/spec/dm-svn/fixtures/fiction_site.rb

@@ -1,84 +0,0 @@
-SvnFixture.repo('fiction_site') do
-  revision(1, 'Create basic directory structure (including articles, app and public)',
-      :date => Time.parse("2008-08-01")) do
-    dir 'articles'
-    dir 'app' do
-      dir 'views' do
-        dir 'ads'
-        dir 'articles'
-        dir 'layouts'
-      end
-    end
-    
-    dir 'public' do
-      dir 'images'
-      dir 'javascripts'
-      dir 'stylesheets'
-    end
-  end
-  
-  revision(2, 'Create scifi, fantasy, and western categories',
-      :date => Time.parse("2008-08-02")) do
-    dir 'articles' do
-      dir 'scifi' do
-        prop 'ws:name', 'Science Fiction'
-      end
-      
-      dir 'fantasy' do
-        prop 'ws:name', 'Fantasy'
-      end
-      
-      dir 'western' do
-        prop 'ws:name', 'Western'
-      end
-    end
-  end
-  
-  revision(3, 'Add two stories in scifi',
-      :date => Time.parse("2008-08-03")) do
-    dir 'articles' do
-      dir 'scifi' do
-        file 'aliens.txt' do
-          prop 'ws:title', 'Alien Story'
-          prop 'ws:published_at', '2008-08-04 12:00:00'
-          body "My first story featuring aliens."
-        end
-        
-        file 'spaceships.txt' do
-          prop 'ws:title', 'Spaceship'
-          prop 'ws:published_at', '2008-08-06 12:00:00'
-          body "This one's just about spaceships."
-        end
-      end
-    end
-  end
-
-  revision(4, 'Add scifi/alien subcategory and move aliens.txt there',
-      :date => Time.parse("2008-08-04")) do
-    dir 'articles' do
-      dir 'scifi' do
-        dir 'alien' do
-          file 'meta.yml' do
-            body "name: Alien Stories"
-          end
-        end
-        
-        move 'aliens.txt', 'alien/first.txt'
-      end
-    end
-  end
-  
-  revision(5, 'Add unpublished fantasy story',
-      :date => Time.parse("2008-08-06")) do
-    dir 'articles' do
-      dir 'fantasy' do
-        file 'knights.txt' do
-          prop 'ws:title', 'Knights'
-          body "A story...with knights!"
-        end
-      end
-    end
-  end
-end
-
-SvnFixture.repo('fiction_site').commit

data/spec/dm-svn/fixtures/news_site.rb

@@ -1,55 +0,0 @@
-SvnFixture::repo('news_site') do
-  revision(1, 'Create basic directory structure (including articles, app and public)',
-      :date => Time.parse("2008-08-01")) do
-    dir 'articles'
-    dir 'app' do
-      dir 'views' do
-        dir 'ads'
-        dir 'articles'
-        dir 'layouts'
-      end
-    end
-    
-    dir 'public' do
-      dir 'images'
-      dir 'javascripts'
-      dir 'stylesheets'
-    end
-  end
-  
-  revision(2, 'Create categories',
-      :date => Time.parse("2008-08-02")) do
-    dir 'articles' do
-      dir 'sports' do
-        prop 'ws:name', 'Sports'
-      end
-      
-      dir 'politics' do
-        prop 'ws:name', 'Politics'
-      end
-    end
-  end
-  
-  revision(3, 'Add two articles',
-      :date => Time.parse("2008-08-03")) do
-    dir 'articles' do
-      dir 'sports' do
-        file 'football.txt' do
-          prop 'ws:title', 'Football'
-          prop 'ws:published_at', '2008-08-04 12:00:00'
-          body "A football story."
-        end
-      end
-      
-      dir 'politics' do
-        file 'election.txt' do
-          prop 'ws:title', 'Election Review'
-          prop 'ws:published_at', '2008-08-04 12:00:00'
-          body "The election seems to go on for a long time."
-        end
-      end
-    end
-  end
-end
-
-SvnFixture.repo('news_site').commit