sape 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa574ed4c40af1747da53671206439a965f58d62
-  data.tar.gz: cccb9aa17fdffe735d12459d4324f1a31ebb1da4
+  metadata.gz: 6bb0853e31de1b10077c70056900dd4ce842964b
+  data.tar.gz: 7b3ad0343f91a2597dee1364b48f363a37742b62
 SHA512:
-  metadata.gz: 9161b2e93cd973d729cdeeaf9f7085b97ef6fc0f19f801dc1ae82b960ae50c300c5812ea06f90d01d793462d1975b089dbf2f28d07490af185bd77d17e881016
-  data.tar.gz: f2dedcc6c60a0a9e426579af34ed640190dd5095fe8fab3d7d23a23f83ef917375a133c1c9add04138c9bb5e16de36cfb583ab8624042b8f66c342805a56f452
+  metadata.gz: 0f2933e1e758f069b46a4a6aefdb1a95c92f297b8fe117ac70702b9b4354d6f7d1580f21b9f6ab8cfa9c51fee658e40e8ed25591fade75573a95cdd1e24c30d1
+  data.tar.gz: 902a0313a2e93fee8373a5455da86d2a5a1e69fb245ce3d57ed0acdbd8c63f4f01752c120afe1887164c2d3120aae23bf1ed385a4384328de37c03ca5aa90808

data/README.md

@@ -25,7 +25,10 @@ gem 'sape'
 * create config/sape.yml
 ```yml
 sape_user: _YOUR_SAPE_HASH_
-host: example.com
+host:
+  - example.com
+  - subdomain1.example.com
+  - subdomain1.example.com
 charset: UTF-8
 ```
 

data/lib/app/helpers/sape_helper.rb

@@ -1,7 +1,7 @@
 module SapeHelper
   def sape_links_block
     request.original_fullpath.chomp!("/") if request.original_fullpath.last == "/" && request.original_fullpath != '/'
-    options = { links: SapeLink.where(page: request.original_fullpath, link_type: "simple") }
+    options = { links: SapeLink.where(page: request.original_fullpath, link_type: "simple", site_host: request.host) }
     if SapeConfig.bot_ips.include?(request.remote_addr)
       options.merge!(check_code: SapeConfig.check_code)
     end
@@ -13,7 +13,7 @@ module SapeHelper
 
   def sape_links
     request.original_fullpath.chomp!("/") if request.original_fullpath.last == "/" && request.original_fullpath != '/'
-    links = SapeLink.where(page: request.original_fullpath, link_type: "simple").
+    links = SapeLink.where(page: request.original_fullpath, link_type: "simple", site_host: request.host).
              pluck(:raw_link).
              join(SapeConfig.delimiter)
 
@@ -24,7 +24,7 @@ module SapeHelper
 
   def sape_context_links(text)
     request.original_fullpath.chomp!("/") if request.original_fullpath.last == "/" && request.original_fullpath != '/'
-    SapeLink.where(page: request.original_fullpath, link_type: "context").each do |link|
+    SapeLink.where(page: request.original_fullpath, link_type: "context", site_host: request.host).each do |link|
       text.sub!(link.anchor, link.raw_link)
     end
 

data/lib/app/models/sape_config.rb

@@ -1,15 +1,15 @@
 class SapeConfig < ActiveRecord::Base
   class << self
     def bot_ips
-      where(name: 'ip').pluck(:value)
+      where(name: 'ip', site_host: request.host).pluck(:value)
     end
 
     def check_code
-      where(name: 'sape_new_url').first.try(:value) || " "
+      where(name: 'sape_new_url', site_host: request.host).first.try(:value) || " "
     end
 
     def delimiter
-      where(name: 'sape_delimiter').first.try(:value) || " "
+      where(name: 'sape_delimiter', site_host: request.host).first.try(:value) || " "
     end
   end
 end

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

@@ -1,11 +1,13 @@
 class CreateSapeStorage < ActiveRecord::Migration
   def change
     create_table :sape_configs do |t|
+      t.string :site_host
       t.string :name
       t.text :value, limit: 500
     end
 
     create_table :sape_links do |t|
+      t.string :site_host
       t.string :page
       t.string :anchor
       t.string :url
@@ -13,6 +15,6 @@ class CreateSapeStorage < ActiveRecord::Migration
       t.text :raw_link, limit: 500
       t.string :link_type
     end
-    add_index :sape_links, [:link_type, :page]
+    add_index :sape_links, [:link_type, :page, :site_host]
   end
 end

data/lib/sape/fetcher.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require 'open-uri'
+require 'domainatrix'
 
 class Fetcher
   class << self
@@ -8,15 +9,14 @@ class Fetcher
       puts text if Rails.env.development?
     end
 
-    def get_data(config, link_type)
+    def get_data(config, link_type, site_host)
 
       sape_user  = config['sape_user']
-      host       = config['host'].downcase
       charset    = config['charset']       || 'utf-8'
       server     = config['server']        || 'dispenser-01.sape.ru'
       links_type = {'simple' => 'code.php', 'context' => 'code_context.php'}
 
-      url = "http://#{server}/#{links_type[link_type]}?user=#{sape_user}&host=#{host}&format=json&no_slash_fix=true"
+      url = "http://#{server}/#{links_type[link_type]}?user=#{sape_user}&host=#{site_host}&format=json&no_slash_fix=true"
 
       begin
         data = open(url)
@@ -27,8 +27,8 @@ class Fetcher
       JSON.parse(data.read)
     end
 
-    def fetch_pages(pages, link_type, delete_old = false)
-      SapeLink.delete_all if delete_old
+    def fetch_pages(pages, link_type, delete_old = false, site_host)
+      SapeLink.where(site_host: site_host).delete_all if delete_old
       say "Links:: #{link_type}"
       pages.each do |page_url, links|
         say "Page: #{page_url}"
@@ -37,15 +37,15 @@ class Fetcher
 
           anchor    = item.css('a').text
           url       = item.css('a').attr('href').text
-          host      = Domainatrix.parse(url).host
-          SapeLink.create page: page_url, anchor: anchor, host: host, raw_link: link, url: url, link_type: link_type
-          say "   Added #{anchor} #{host} #{url}"
+          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
     end
 
-    def fetch_config(config_data, bot_ips)
-      SapeConfig.delete_all
+    def fetch_config(config_data, bot_ips, site_host)
+      SapeConfig.where(site_host: site_host).delete_all
       say "Ips:"
       bot_ips.each do |ip|
         SapeConfig.create name: 'ip', value: ip
@@ -53,7 +53,7 @@ class Fetcher
       end
       say "Config"
       config_data.each do |item, data|
-        SapeConfig.create name: item, value: data
+        SapeConfig.create site_host: site_host, name: item, value: data
         say "   Added #{item} = #{data}"
       end
     end

data/lib/sape/version.rb

@@ -1,3 +1,3 @@
 module Sape
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/tasks/sape.rake

@@ -3,26 +3,28 @@ namespace :sape do
   desc "Fetch links from server"
   task fetch: :environment do
     begin
-      config = YAML.load_file('config/sape.yml') 
+      config = YAML.load_file('config/sape.yml')
     rescue Errno::ENOENT
       fail "Config file not found (config/sape.yml)"
     end
+    [*config['host']].each do |site_host|
+      puts "Start work with: #{site_host}" if Rails.env.development?
 
-    data          = Fetcher.get_data(config, 'simple')
-    data_context  = Fetcher.get_data(config, 'context')
-    configs, config_data = {}, {}
+      data          = Fetcher.get_data(config, 'simple', site_host)
+      data_context  = Fetcher.get_data(config, 'context', site_host)
+      configs, config_data = {}, {}
 
-    pages         = data['__sape_links__']
-    pages_context = data_context['__sape_links__']
-    bot_ips       = data['__sape_ips__']
+      pages         = data['__sape_links__']
+      pages_context = data_context['__sape_links__']
+      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}__"]
-    end
-
-    Fetcher.fetch_config(config_data, bot_ips)    if pages.any?
-    Fetcher.fetch_pages(pages, 'simple', true)          if pages.any?
-    Fetcher.fetch_pages(pages_context, 'context') if pages_context.any?
+      %W{sape_delimiter sape_show_only_block sape_page_obligatory_output sape_new_url}.each do |item|
+        config_data[item] = data["__#{item}__"]
+      end
 
+      Fetcher.fetch_config(config_data, bot_ips, site_host)            if pages.any?
+      Fetcher.fetch_pages(pages, 'simple', true, site_host)            if pages.any?
+      Fetcher.fetch_pages(pages_context, 'context', false, site_host)  if pages_context.any?
+    end
   end
 end

data/spec/dummy/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.1.1'
+gem 'rails', '4.1.8'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 # Use SCSS for stylesheets

data/spec/dummy/config/sape.yml

@@ -0,0 +1,6 @@
+sape_user: abcdefg
+host:
+  - kremlin.ru
+  - kremlin2.ru
+  - kremlin3.ru
+charset: UTF-8

data/spec/dummy/db/migrate/20140715193855_create_sape_storage.rb

@@ -1,18 +1,20 @@
 class CreateSapeStorage < ActiveRecord::Migration
   def change
     create_table :sape_configs do |t|
+      t.string :site_host
       t.string :name
-      t.string :value
+      t.text :value, limit: 500
     end
 
     create_table :sape_links do |t|
+      t.string :site_host
       t.string :page
       t.string :anchor
       t.string :url
       t.string :host
-      t.string :raw_link
+      t.text :raw_link, limit: 500
       t.string :link_type
     end
-    add_index :sape_links, [:link_type, :page]
+    add_index :sape_links, [:link_type, :page, :site_host]
   end
 end

data/spec/dummy/db/schema.rb

@@ -11,22 +11,24 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140715193855) do
+ActiveRecord::Schema.define(version: 20141225123124) do
 
   create_table "sape_configs", force: true do |t|
+    t.string "site_host"
     t.string "name"
-    t.string "value"
+    t.text   "value",     limit: 500
   end
 
   create_table "sape_links", force: true do |t|
+    t.string "site_host"
     t.string "page"
     t.string "anchor"
     t.string "url"
     t.string "host"
-    t.string "raw_link"
+    t.text   "raw_link",  limit: 500
     t.string "link_type"
   end
 
-  add_index "sape_links", ["link_type", "page"], name: "index_sape_links_on_link_type_and_page"
+  add_index "sape_links", ["link_type", "page", "site_host"], name: "index_sape_links_on_link_type_and_page_and_site_host"
 
 end

data/spec/fixtures/sape.yml

@@ -1,3 +1,6 @@
 sape_user: abcdefg
-host: kremlin.ru
+host:
+  - kremlin.ru
+  - kremlin2.ru
+  - kremlin3.ru
 charset: UTF-8

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sape
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Pavel Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -258,6 +258,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/sape.yml
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/migrate/20140715193855_create_sape_storage.rb
 - spec/dummy/db/schema.rb
@@ -307,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sape.ru Ruby On Rails module
@@ -349,6 +350,7 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/sape.yml
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/migrate/20140715193855_create_sape_storage.rb
 - spec/dummy/db/schema.rb