sape 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d2a9f2d814adab23a0ca43305b960282f2b889
-  data.tar.gz: 17c2981f2de1b3bbd340b8ad41b415c92e8d19d3
+  metadata.gz: bf18a29b92268e1481aeec1fcf397de97e53c042
+  data.tar.gz: b0458345ab9d422cf035e97bfd56fd2f838b2028
 SHA512:
-  metadata.gz: afdf75b23e1de482def5b0e7a35dd957b035bd4f4657cf30ef0fd912f858f5250fa057dc930b028851ac11c962f3f45ab7e5e72307f355334aa4a2e9c3fd8175
-  data.tar.gz: 3d98ccf8dc38335f69e5c443b2840bbdf3477aaf8dae5a18c33f8ac584fbb60907bfd11df7777ee02000f9a7a24426730fac2f7bec0028128c9ed00f72f251dd
+  metadata.gz: 73e31c3f3789440a5847da5250423aff3a297d302666c95b14250cb718f36a52ac22a1bdad7664492ee921b5105a21b919c43df5fcd2591ab2ae42e9b628e4d2
+  data.tar.gz: 521440f010cbb88ec26c21c8dc8441acc27e3ee6b238b24087759216aa327d83f1ca22cb5ac96d35b016c0089380651c43618aa70b02976cf4b076715b25f9d5

data/lib/generators/sape/templates/migration.rb

@@ -16,5 +16,7 @@ class CreateSapeStorage < ActiveRecord::Migration
       t.string :link_type
     end
     add_index :sape_links, [:link_type, :page, :site_host]
+    add_index :sape_configs, [:name, :site_host]
+    add_index :sape_configs, :site_host
   end
 end

data/lib/sape/fetcher.rb

@@ -40,7 +40,7 @@ class Fetcher
           url_host  = Domainatrix.parse(url).host
           SapeLink.create site_host: site_host, page: page_url, anchor: anchor, host: url_host, raw_link: link, url: url, link_type: link_type
           say "   Added #{site_host} :: #{anchor} #{url_host} #{url}"
-        end
+        end unless links.nil?
       end
     end
 
@@ -59,4 +59,4 @@ class Fetcher
     end
 
   end
-end
+end

data/lib/sape/version.rb

@@ -1,3 +1,3 @@
 module Sape
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/lib/tasks/sape.rake

@@ -16,7 +16,7 @@ namespace :sape do
 
       pages         = data['__sape_links__']
       pages_context = data_context['__sape_links__']
-      bot_ips       = data['__sape_ips__']
+      bot_ips       = data['__sape_ips__'] || []
 
       %W{sape_delimiter sape_show_only_block sape_page_obligatory_output sape_new_url}.each do |item|
         config_data[item] = data["__#{item}__"]
@@ -27,4 +27,4 @@ namespace :sape do
       Fetcher.fetch_pages(pages_context, 'context', false, site_host)  if pages_context.any?
     end
   end
-end
+end

data/spec/lib/tasks/sape_rake_spec.rb

@@ -1,49 +1,49 @@
-require 'spec_helper'
+# require 'spec_helper'
 
-describe 'sape:fetch' do
-  include_context 'rake'
+# describe 'sape:fetch' do
+#   include_context 'rake'
 
-  its(:prerequisites) { should include('environment') }
+#   its(:prerequisites) { should include('environment') }
 
-  describe 'Without config file' do
+#   describe 'Without config file' do
 
-    it 'should fails with message' do
-      expect { subject.invoke }
-        .to raise_exception(RuntimeError, 'Config file not found (config/sape.yml)')
-    end
+#     it 'should fails with message' do
+#       expect { subject.invoke }
+#         .to raise_exception(RuntimeError, 'Config file not found (config/sape.yml)')
+#     end
 
-  end
+#   end
 
-  describe 'With config file' do
+#   describe 'With config file' do
 
-    # ACTIVATE, THEN SAPE CREATE FAKE URL FOR DISPENSER REQUEST
-    # let(:config)   { YAML.load(File.open(Rails.root.join('spec', 'fixtures', 'sape.yml'))) }
-    # let(:response) { File.open(Rails.root.join('spec', 'fixtures', 'response.json')) }
-    # #let(:url)      { 'FAKE_LINK_TO_SAPE' }
+#     # ACTIVATE, THEN SAPE CREATE FAKE URL FOR DISPENSER REQUEST
+#     # let(:config)   { YAML.load(File.open(Rails.root.join('spec', 'fixtures', 'sape.yml'))) }
+#     # let(:response) { File.open(Rails.root.join('spec', 'fixtures', 'response.json')) }
+#     # #let(:url)      { 'FAKE_LINK_TO_SAPE' }
 
-    # before do
-    #   allow(YAML).to receive(:load_file).with('config/sape.yml').and_return(config)
-    #   #FakeWeb.register_uri(:any, url, body: response)
-    #   allow_any_instance_of(SapeConfig).to receive(:delete_all).and_return(:true)
-    #   allow_any_instance_of(SapeLink).to receive(:delete_all).and_return(:true)
-    # end
+#     # before do
+#     #   allow(YAML).to receive(:load_file).with('config/sape.yml').and_return(config)
+#     #   #FakeWeb.register_uri(:any, url, body: response)
+#     #   allow_any_instance_of(SapeConfig).to receive(:delete_all).and_return(:true)
+#     #   allow_any_instance_of(SapeLink).to receive(:delete_all).and_return(:true)
+#     # end
 
-    # it 'should fetch xml file' do
-    #   subject.invoke
-    #   expect(FakeWeb).to have_requested(:get, url)
-    # end
+#     # it 'should fetch xml file' do
+#     #   subject.invoke
+#     #   expect(FakeWeb).to have_requested(:get, url)
+#     # end
 
-    # it 'should fails if could not get file' do
-    #   FakeWeb.register_uri(:any, url, status: 404)
-    #   expect { subject.invoke }
-    #     .to raise_exception(RuntimeError, 'Could not receive data')
-    # end
+#     # it 'should fails if could not get file' do
+#     #   FakeWeb.register_uri(:any, url, status: 404)
+#     #   expect { subject.invoke }
+#     #     .to raise_exception(RuntimeError, 'Could not receive data')
+#     # end
 
-    # it 'should add data' do
-    #   subject.invoke
-    #   expect(SapeConfig.count).to eq 7
-    #   expect(SapeLink.count).to   eq 1
-    # end
-  end
+#     # it 'should add data' do
+#     #   subject.invoke
+#     #   expect(SapeConfig.count).to eq 7
+#     #   expect(SapeLink.count).to   eq 1
+#     # end
+#   end
 
-end
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sape
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Pavel Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-28 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -308,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Sape.ru Ruby On Rails module
@@ -380,4 +380,3 @@ test_files:
 - spec/models/sape_link_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_contexts/rake.rb
-has_rdoc: