middleman-robots 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4f01f8d0fdf3304844fdb713988704f4f423358
-  data.tar.gz: 001ecdfa3873a65ad43e8efb9e62372622dba93b
+  metadata.gz: ed8435b671910bf6bef582f73d1daaf2697ffc5c
+  data.tar.gz: f6a673e16af25cb55af1cf1fc5c33654e25140be
 SHA512:
-  metadata.gz: 0be81551938bbf181122120adb2bb52b3e8c87580fd93bb8b1651809ec838744eac22171aec43ed0962f2d44e518fd325d0899f54ee47f201cbaff0cea5a5d1c
-  data.tar.gz: 029da2753b999fcd612fec08d7ab68386a5541a63cc5f5d0ec057fdf471dea09d3f0712016932ce722604bb044c26d55613448c4a7e8e71a1924b6bc3c6ebd4d
+  metadata.gz: 2138d6831db51ec5465c199546ffd42823748f2101f50427178d7fa88f810c97f547b29b6eb3f1b6217e7c71c72d860a4691c197f8bfea4703c49e5976eb84ed
+  data.tar.gz: 198d3e0a6d7ab5f8a792877b3e33544cdbd53e5059b1d5108cfde0628c39fcfd16c462a37fcfcaea5f55b975ebe67e78d09db317672a6b1b08097d9fb0ed749a

data/.travis.yml

@@ -1,14 +1,19 @@
 language: ruby
-script: "bundle exec cucumber"
+script: bundle exec cucumber
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-  - jruby-19mode
+- ruby-head
+- jruby-head
+- jruby-19mode
+- 2.2
+- 2.1
+- 2.0
+- 1.9.3
+os:
+- linux
+- osx
 env: TEST=true TRAVIS=true
 gemfile:
-  - Gemfile
+- Gemfile
 notifications:
-  webhooks:
-    - https://idobata.io/hook/travis_ci/80f5bf2c-144d-48e4-9283-3a5d4d5f53e2
-
+  slack:
+    secure: C8xb94J4fstzAI7t9GcvKQieKc1k+ECA96ydcxDwBI1fAbupQjz4jafMwnOnD1g9QMe8hlykSNUlCXNCbcA9DZG7COjPZHCY3Icv1+0Dp44bBTDQldR8DPACPMU5Qe+pWoTZViPgJQ7tq2V9TXrGdOnOtkPTwZ9KtZrmNhxW7tM=

data/features/robots.feature

@@ -11,7 +11,45 @@ Feature: Middleman-Robots
     And a successfully built app at "basic-app"
     When I cd to "build"
     Then a file named "robots.txt" should exist
-    And the output should contain "middleman-robots: robots.txt created"
+    And the output should contain "== middleman-robots: robots.txt created =="
+
+  Scenario: Rules option with user_agent
+    Given a fixture app "basic-app"
+    And a file named "config.rb" with:
+      """
+      configure :build do
+        activate :robots, :rules => [
+          {:user_agent => '*'}
+        ]
+      end
+      """
+    And a successfully built app at "basic-app"
+    When I cd to "build"
+    Then the file "robots.txt" should contain exactly:
+      """
+      User-Agent: *
+
+      """
+
+  Scenario: Rules option with user_agent using block
+    Given a fixture app "basic-app"
+    And a file named "config.rb" with:
+      """
+      configure :build do
+        activate :robots do |r|
+          r.rules = [
+            {:user_agent => '*'}
+          ]
+        end
+      end
+      """
+    And a successfully built app at "basic-app"
+    When I cd to "build"
+    Then the file "robots.txt" should contain exactly:
+      """
+      User-Agent: *
+
+      """
 
   Scenario: Rules option with user_agent
     Given a fixture app "basic-app"

data/lib/middleman-robots/extension.rb

@@ -1,60 +1,70 @@
 module Middleman
   module Robots
+    # Robots Extension Class
+    #
+    # Create robots.txt when `$ middleman build`
     class Extension < ::Middleman::Extension
       option :rules, [], 'List of rules about sitemap.xml'
       option :sitemap, false, 'URI of sitemap.xml'
 
       def initialize(app, options_hash = {}, &block)
         super
+        build_dir = app.build_dir
 
         data = rules(options.rules) + sitemap(options.sitemap)
         data.gsub!(/\n+$/, "\n")
 
-        build_dir = app.build_dir
         app.after_build do
-          File.open(File.join(build_dir, "robots.txt"), "w") do |file|
+          File.open(File.join(build_dir, 'robots.txt'), 'w') do |file|
             file.puts(data)
           end
-          puts "   middleman-robots: robots.txt created"
+          logger.info '== middleman-robots: robots.txt created =='
         end
       end
 
       def rules(rules)
         return '' if rules.empty?
-
         data = []
         rules.each do |rule|
           row = []
+          row << user_agent(rule)
+          row << disallow(rule)
+          row << allow(rule)
+          row.compact!
+          data << row.join("\n") + "\n\n" if row.length > 0
+        end
+        data.join('')
+      end
 
-          if (rule["user-agent"] || rule[:user_agent])
-            user_agent = rule[:user_agent] || rule["user-agent"]
-            row << "User-Agent: #{user_agent}"
-          end
-
-          if (rule[:disallow])
-            rule[:disallow].each do |path|
-              path = "/" + path unless /^\// =~ path
-              row << "Disallow: #{path}"
-            end
-          end
-
-          if (rule[:allow])
-            rule[:allow].each do |path|
-              path = "/" + path unless /^\// =~ path
-              row << "Allow: #{path}"
-            end
-          end
+      def user_agent(rule)
+        return unless rule.key?('user-agent') || rule.key?(:user_agent)
+        user_agent = rule[:user_agent] || rule['user-agent']
+        "User-Agent: #{user_agent}"
+      end
 
-          data << row.join("\n") + "\n\n" if row.length > 0
+      def disallow(rule)
+        return unless rule.key?(:disallow)
+        lines = []
+        rule[:disallow].each do |path|
+          path = File.join('/', path) unless /^\// =~ path
+          lines << "Disallow: #{path}"
         end
+        lines
+      end
 
-        data.join('')
+      def allow(rule)
+        return unless rule.key?(:allow)
+        lines = []
+        rule[:allow].each do |path|
+          path = File.join('/' + path) unless /^\// =~ path
+          lines << "Allow: #{path}"
+        end
+        lines
       end
 
       def sitemap(path)
-        path ? "Sitemap: #{path}" : ""
+        path ? "Sitemap: #{path}" : ''
       end
     end
   end
 end
-

data/lib/middleman-robots/version.rb

@@ -1,5 +1,6 @@
 module Middleman
+  # Middleman robots module
   module Robots
-    VERSION = "1.0.0"
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-robots
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - yterajima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
@@ -125,7 +125,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: Create robots.txt when do 'build'.