rivendell-import 0.8 → 0.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rivendell-import (0.8)
+    rivendell-import (0.9)
       SyslogLogger (~> 2.0)
       activerecord (~> 3.2.8)
       activesupport (~> 3.2.8)
@@ -93,8 +93,9 @@ GEM
       guard (>= 1.1)
       rspec (~> 2.11)
     highline (1.6.16)
-    httmultiparty (0.3.10)
+    httmultiparty (0.3.14)
       httparty (>= 0.7.3)
+      mimemagic
       multipart-post
     httparty (0.11.0)
       multi_json (~> 1.0)
@@ -112,10 +113,11 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
+    mimemagic (0.2.1)
     multi_json (1.8.2)
     multi_test (0.0.3)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
     net-scp (1.1.0)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.1)
@@ -124,7 +126,7 @@ GEM
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     null_logger (0.0.1)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     rack (1.5.2)
     rack-protection (1.5.1)
       rack

data/features/manage_file_matching.feature

@@ -1,7 +1,4 @@
-Feature: Manage Cart attributes
-  In order to organize dropboxes
-  An user
-  wants to filter files by name
+Feature: Manage file matching
 
   Scenario: Select a file by Ruby regexp
     Given a configuration with this prepare block

data/lib/rivendell/import/base.rb

@@ -45,7 +45,20 @@ module Rivendell::Import
       end
     end
 
+    attr_accessor :file_patterns
+    def file_patterns
+      @file_patterns ||= ["**/*", "*"]
+    end
+
+    def ignore?(path)
+      not file_patterns.any? do |file_pattern|
+        ::File.fnmatch file_pattern, path, ::File::FNM_PATHNAME | ::File::FNM_CASEFOLD
+      end
+    end
+
     def file(path, base_directory = nil)
+      return if ignore? path
+
       path = ::File.expand_path(path, base_directory)
       file = Rivendell::Import::File.new path, :base_directory => base_directory
       create_task file

data/lib/rivendell/import/cart.rb

@@ -60,7 +60,7 @@ module Rivendell::Import
     end
 
     def empty_title?(title)
-      not [ nil, "", "[new cart]" ].include? title
+      [ nil, "", "[new cart]" ].include? title
     end
 
     def update_by_api

data/lib/rivendell/import/version.rb

@@ -1,5 +1,5 @@
 module Rivendell
   module Import
-    VERSION = "0.8"
+    VERSION = "0.9"
   end
 end

data/spec/rivendell/import/base_spec.rb

@@ -126,4 +126,25 @@ describe Rivendell::Import::Base do
 
   end
 
+  describe "#ignore?" do
+
+    context "when default file patterns" do
+
+      it "should ignore hidden file" do
+        subject.ignore?("path/to/.nfs00000000074200420000000c").should be_true
+        subject.ignore?(".nfs00000000074200420000000c").should be_true
+      end
+
+      it "should accept files in directories" do
+        subject.ignore?("path/to/normal_file.mp3").should be_false
+      end
+
+      it "should accept files in root directory" do
+        subject.ignore?("file").should be_false
+      end
+
+    end
+
+  end
+
 end

data/spec/rivendell/import/cart_spec.rb

@@ -208,5 +208,60 @@ describe Rivendell::Import::Cart do
 
   end
 
+  describe "#empty_title?" do
 
+    it "should true when title is nil" do
+      subject.empty_title?(nil).should be_true
+    end
+
+    it "should true when title is '[new cart]'" do
+      subject.empty_title?('[new cart]').should be_true
+    end
+
+    it "should false when title is anything else" do
+      subject.empty_title?('dummy').should be_false
+    end
+
+  end
+
+  describe "update" do
+
+    it "should invoke update_by_api" do
+      subject.should_receive :update_by_api
+      subject.update
+    end
+
+    context "when when update_by_api fails" do
+
+      before do
+        subject.stub(:update_by_api).and_raise("#fail")
+      end
+
+      context "when database is enabled" do
+
+        before do
+          Rivendell::Import::Database.stub :enabled? => true
+        end
+
+        it "should invoke update_by_db " do
+          subject.should_receive :update_by_db
+          subject.update
+        end
+
+      end
+
+      context "when database is disabled" do
+
+        before do
+          Rivendell::Import::Database.stub :enabled? => false
+        end
+
+        it "should not invoke update_by_db " do
+          subject.should_not_receive :update_by_db
+          subject.update
+        end
+
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivendell-import
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -482,7 +482,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1555442861481114113
+      hash: 1053952433249090038
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -491,7 +491,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1555442861481114113
+      hash: 1053952433249090038
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23