dca 0.1.0 → 0.1.1

data/Rakefile

@@ -16,7 +16,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "dca"
-  gem.homepage = "http://github.com/maxkazargm@gmail.com/dca"
+  gem.homepage = "http://github.com/maxkazar/dca"
   gem.license = "MIT"
   gem.summary = %Q{DCA}
   gem.description = %Q{DCA}
@@ -45,4 +45,4 @@ YARD::Rake::YardocTask.new
 
 SYS_ENV = 'development'
 require './lib/dca'
-require 'resque/tasks'
+require 'resque/tasks'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/dca.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dca"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maxim Kazarin"]
-  s.date = "2012-07-28"
+  s.date = "2012-08-10"
   s.description = "DCA"
   s.email = "maxkazargm@gmail.com"
   s.executables = ["dca"]
@@ -88,7 +88,7 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/storage_examples.rb"
   ]
-  s.homepage = "http://github.com/maxkazargm@gmail.com/dca"
+  s.homepage = "http://github.com/maxkazar/dca"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"

data/lib/dca/commands/area.rb

@@ -101,7 +101,7 @@ module DCA
             ops[:err] = debug_file
             ops[:out] = debug_file
           end
-          env_vars = {'QUEUE' => queue}
+          env_vars = {'QUEUE' => queue, 'SYS_ENV' => SYS_ENV}
 
           count.times {
             ## Using Kernel.spawn and Process.detach because regular system() call would

data/lib/dca/config.rb

@@ -1,3 +1,5 @@
+SYS_ENV = ENV['SYS_ENV'] if ENV['SYS_ENV']
+
 SYS_ENV = 'development' unless defined? SYS_ENV
 
 unless defined? APP_CONFIG

data/lib/dca/models/nokogiri_binder.rb

@@ -33,7 +33,12 @@ module DCA
         type = params[:type]
         type = find_type object, params[:field], options[:polymorphic] if type.nil? || options[:polymorphic]
 
-        result = content.css(selector).map { |node| type.new.bind node } unless selector.nil?
+        unless selector.nil?
+          result = content.css(selector)
+          result = object.send(options[:parser], result) unless options[:parser].nil?
+
+          result = result.map { |node| type.new.bind node } unless result.nil?
+        end
         result
       end
 

data/lib/dca/storage/elasticsearch_storage.rb

@@ -5,7 +5,7 @@ module DCA
     def initialize(connection, context, options = {})
       @connection = connection
       @index = options[:index] || DCA.project_name.underscore
-      @type = options[:type] || context.to_s.demodulize.downcase.pluralize
+      @type = options[:type] || get_alias(context)
     end
 
     def self.establish_connection(config)
@@ -13,7 +13,6 @@ module DCA
       Tire.configure { url "http://#{config[:host]}:#{config[:port]}" }
     end
 
-
     def state position
       item = find position
       return :create if item.nil?
@@ -26,7 +25,7 @@ module DCA
 
     def find position
       return nil if position.base_id.nil?
-      query = Tire.search(@index, :type => type) { query { term :base_id, position.base_id } }
+      query = Tire.search(@index, type: type) { query { term :base_id, position.base_id } }
       query.results.first
     end
 
@@ -36,8 +35,7 @@ module DCA
 
     def create(item)
       item.updated_at = item.created_at = Time.now.utc
-      data = item.to_hash
-      data[:type] = type
+      data = hash_from item
 
       result = Tire.index(@index).store data
       Tire.index(@index).refresh
@@ -46,9 +44,7 @@ module DCA
     end
 
     def update(item)
-      data = item.to_hash
-      data[:type] = type
-
+      data = hash_from item
       Tire.index(@index) do
         store data
         refresh
@@ -56,8 +52,7 @@ module DCA
     end
 
     def remove(item)
-      data = item.to_hash
-      data[:type] = type
+      data = hash_from item
 
       Tire.index(@index) do
         remove data
@@ -73,8 +68,22 @@ module DCA
 
     def context object
       result = self.clone
-      result.instance_variable_set :@type, object.to_s.demodulize.downcase.pluralize
+      result.instance_variable_set :@type, get_alias(object)
       result
     end
+
+    private
+
+    def hash_from(item)
+      data = item.to_hash
+      data[:_id] = data[:id] if data[:id]
+      data.delete(:id)
+      data[:type] = type
+      data
+    end
+
+    def get_alias object
+      object.respond_to?(:alias) ? object.alias : object.to_s.demodulize.downcase.pluralize
+    end
   end
 end

data/lib/dca/storage/mongo_storage.rb

@@ -5,7 +5,7 @@ module DCA
     def initialize(connection, context, options = {})
       @database = connection.db(options[:database] || DCA.project_name.underscore)
       @connection = connection
-      @collection = database.collection(options[:collection] || context.to_s.demodulize.downcase.pluralize)
+      @collection = database.collection(options[:collection] || get_alias(context))
     end
 
     def self.establish_connection(config)
@@ -31,11 +31,11 @@ module DCA
     end
 
     def create(item)
-      item.id = collection.insert item.to_hash
+      item.id = collection.insert hash_from item
     end
 
     def update(item)
-      collection.update({_id: item.id}, item.to_hash)
+      collection.update({_id: item.id}, hash_from(item))
     end
 
     def remove(item)
@@ -44,8 +44,20 @@ module DCA
 
     def context object
       result = self.clone
-      result.instance_variable_set :@collection, result.database.collection(object.to_s.demodulize.downcase.pluralize)
+      result.instance_variable_set :@collection, result.database.collection(get_alias object)
       result
     end
+
+    private
+
+    def hash_from(item)
+      data = item.to_hash
+      data.delete(:id)
+      data
+    end
+
+    def get_alias object
+      object.respond_to?(:alias) ? object.alias : object.to_s.demodulize.downcase.pluralize
+    end
   end
 end

data/spec/binder_spec.rb

@@ -64,6 +64,22 @@ describe 'Binder' do
     page.bind Nokogiri::HTML open('./spec/fixtures/page.html')
 
     page.positions.should have(6).items
+  end
+
+  describe 'parser option' do
+    it 'should be used for has_many association' do
+      page = Mock::PageExt.new :category => :full
+      page.should_receive(:positions_parser)
+      page.bind Nokogiri::HTML open('./spec/fixtures/page.html')
+    end
 
+    it 'should change items collections for has_many association' do
+      page = Mock::PageExt.new :category => :full
+      page.should_receive(:positions_parser) do |items|
+        items[0,2]
+      end
+      page.bind Nokogiri::HTML open('./spec/fixtures/page.html')
+      page.positions.should have(2).items
+    end
   end
 end

data/spec/mock/page.rb

@@ -7,7 +7,11 @@ module DCA
 
     class PageExt < DCA::Models::BaseModel
       attr_accessor :category
-      has_many :positions, :selector => 'li', :polymorphic => :category, :append => true
+      has_many :positions, :selector => 'li', polymorphic: :category, append: true, parser: :positions_parser
+
+      def positions_parser items
+        items
+      end
     end
   end
 end

data/spec/mock/position.rb

@@ -11,17 +11,17 @@ module DCA
     class Position < DCA::Models::Position
       attr_accessor :raise, :failed, :title
 
-      has_one :base_id, :integer, :selector => 'a', :attribute => :href, :regex => /(\d+)$/
-      has_one :title,   :string,  :selector => 'a'
+      has_one :base_id, :integer, selector: 'a', attribute: :href, regex: /(\d+)$/
+      has_one :title,   :string,  selector: 'a'
     end
 
     class ExtPosition < Position
-      has_one :description, :string, :selector => 'span.description'
-      has_one :date,        :datetime, :selector => 'span.date'
+      has_one :description, :string, selector: 'span.description'
+      has_one :date,        :datetime, selector: 'span.date'
     end
 
     class FullPosition < Position
-      has_one :base_id, :string, :selector => 'a'
+      has_one :base_id, :string, selector: 'a'
     end
 
     class ChildPosition < DCA::Models::Position

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dca
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-28 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
@@ -377,7 +377,7 @@ files:
 - spec/redis_notifier_spec.rb
 - spec/spec_helper.rb
 - spec/support/storage_examples.rb
-homepage: http://github.com/maxkazargm@gmail.com/dca
+homepage: http://github.com/maxkazar/dca
 licenses:
 - MIT
 post_install_message: 
@@ -392,7 +392,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3864931138559623634
+      hash: -922341340546014449
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: