cangrejo 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1dbfe77d61457fdd08adec73b986880cccdbca7
-  data.tar.gz: 50e679dd6e37f84077acd2f7afe294ceb790d432
+  metadata.gz: 4b442485758a976c42a6d7d5ff6682a47f5ba4ff
+  data.tar.gz: b5dfee2e538ec781b3ce44867ff763e2e3b1d033
 SHA512:
-  metadata.gz: 7cd54e40ce06c48c1033f9ab47bc93bef9c52d0945dc1fc5248ebe0017c33f5b87016f42b662eacbfc2b8022deefdf126d50ee3ee2b69503e3502306afc77cbe
-  data.tar.gz: 9fe03c91514390b132b7f6e725a28e5301f0c539ed3a20e5323f4dae4a734d21fc65acf710b2e06fddbea177ee7bca3ce3a049a9788438f226a20a7c502d57d0
+  metadata.gz: 014f5bf8f5f5d56e8afdff1d0ffbf21a4a2cc13c22ff9b34875af4f08f11c3450a85a79efd46ca5495155dddad1dc0101c9c177bb1448b71969aaa32889fc81b
+  data.tar.gz: b3119281d804c14fda96bfbdb23f9a488a45f76f72738aacca5be53b90691524400239132ecb948a47ed3167c714396ef6c4c9a842a0898b8ca0233f7c3a9b0a

data/lib/cangrejo/configurator.rb

@@ -4,8 +4,7 @@ module Cangrejo
     [
       :crabfarm_host,
       :crawler_cache_path,
-      :temp_path,
-      :hold_by_default
+      :temp_path
     ]
     .each do |name|
       define_method "set_#{name}" do |value|
@@ -17,7 +16,11 @@ module Cangrejo
       @config = _config
     end
 
-    def crawler(_name, _options)
+    def set_crawler_setup(_options)
+      @config.crawlers[nil] = _options
+    end
+
+    def set_crawler_setup_for(_name, _options)
       @config.crawlers[_name] = _options
     end
 

data/lib/cangrejo/modes/remote.rb

@@ -4,22 +4,30 @@ module Cangrejo
   module Modes
     class Remote
 
-      def initialize(_name)
-        @name = _name
+      def initialize(_remote)
+        @remote = _remote
       end
 
       def setup
-        sessions = prepare_resource "api/crawlers/#{@name}/sessions"
-        sessions.post({}.to_json)
-        return prepare_resource "api/sessions/#{sessions.id}"
+        @session = create_session
       end
 
       def release
-        # nothing
+        @session.put({ status: 'finished' }) unless @session.nil?
+        @session = nil
       end
 
     private
 
+      def session_collection
+        @collection ||= prepare_resource "api/bots/#{@remote}/sessions"
+      end
+
+      def create_session
+        new_session_id = session_collection.post({}.to_json).id
+        prepare_resource "api/sessions/#{new_session_id}"
+      end
+
       def prepare_resource(_path)
         RestClient::JsonResource.new URI.join(remote_host, _path).to_s
       end

data/lib/cangrejo/restclient/json_resource.rb

@@ -8,16 +8,24 @@ module RestClient
       additional_headers['Accept'] = 'json'
       r = super additional_headers, &block
       @state = JSON.parse r
+      self
     end
 
     def post(payload, additional_headers={}, &block)
       r = super payload.to_json, decorate_headers(additional_headers), &block
       @state = JSON.parse r
+      self
     end
 
     def put(payload, additional_headers={}, &block)
       r = super payload.to_json, decorate_headers(additional_headers), &block
       @state = JSON.parse r
+      self
+    end
+
+    def delete(additional_headers={}, &block)
+      super decorate_headers(additional_headers), &block
+      self
     end
 
   private

data/lib/cangrejo/session.rb

@@ -1,3 +1,4 @@
+require 'date'
 require "ostruct"
 
 module Cangrejo
@@ -7,11 +8,30 @@ module Cangrejo
 
     attr_reader :doc, :state_name, :state_params
 
-    def initialize(_name, _options={})
-      @name = _name
-      options = Cangrejo.config.crawlers.fetch(_name, {}).merge _options
+    def self.connect _name_or_config
+      session = Session.new _name_or_config
+      begin
+        session.start
+        yield session
+      ensure
+        session.release
+      end
+    end
+
+    def initialize(_name_or_config)
+      options = if _name_or_config.is_a? Hash
+        @name = nil
+        _name_or_config
+      else
+        @name = _name_or_config
+        Cangrejo.config.crawlers.fetch(_name, {})
+      end
+
       select_mode options
-      start unless _options.fetch :hold, Cangrejo.config.hold_by_default
+    end
+
+    def started?
+      not @rest.nil?
     end
 
     def start
@@ -45,6 +65,7 @@ module Cangrejo
 
     def release
       @mode.release
+      @rest = nil
       self
     end
 
@@ -82,7 +103,7 @@ module Cangrejo
         Modes::Git.new _options[:git_remote], _options[:git_commit], _options[:relative_path], @name
       else
         require "cangrejo/modes/remote"
-        Modes::Remote.new @name
+        Modes::Remote.new _options.fetch(:remote, @name)
       end
     end
 

data/lib/cangrejo/version.rb

@@ -1,3 +1,3 @@
 module Cangrejo
-  VERSION = "0.0.12"
+  VERSION = "0.1.0"
 end

data/lib/cangrejo.rb

@@ -9,7 +9,6 @@ module Cangrejo
     crabfarm_host: 'http://api.crabfarm.io',
     crawler_cache_path: 'tmp/crawler_cache',
     temp_path: 'tmp',
-    hold_by_default: false,
     crawlers: Hash.new
   })
 
@@ -20,4 +19,10 @@ module Cangrejo
   def self.configure
     yield Configurator.new @@config
   end
+
+  def self.connect _name_or_config=nil, &_block
+    _name_or_config = config[:crawlers].values.first if _name_or_config.nil?
+    Session.connect _name_or_config, &_block
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cangrejo
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - ignacio@platan.us