flatfish 0.3.3 → 0.3.4

data/.gitignore

@@ -1,2 +1,3 @@
 flatfish*gem
 *.swp
+example/schema.yml

data/Rakefile

@@ -9,15 +9,3 @@ Rake::TestTask.new("test_units") do |t|
   t.verbose = false 
   t.warning = true
 end
-
-RUBY='1.9.3'
-
-desc "Build gem"
-task :build_gem do
-  system "rvm #{RUBY} do gem build flatfish.gemspec"
-end
-
-desc "Install gem"
-task :install_gem => :build_gem do
-  system "sudo rvm #{RUBY} do gem install flatfish-*.gem"
-end

data/example/bio.csv

@@ -0,0 +1,32 @@
+"url","path","title","body","field_position"
+"http://drupalconnect.com/team/john-florez","bio/john-florez","John Florez",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/jonathon-whitener","bio/jonathon-whitener","Jonathon Whitener",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/tim-loudon","bio/tim-loudon","Tim Loudon",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/mike-crittenden","bio/mike-crittenden","Mike Crittenden",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/christopher-jones","bio/christopher-jones","Christopher Jones",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/chris-akeley","bio/chris-akeley","Chris Akeley",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/kim-murphy","bio/kim-murphy","Kim Murphy",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/bill-minor","bio/bill-minor","Bill Minor",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/chris-boag","bio/chris-boag","Chris Boag",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/steve-edwards","bio/steve-edwards","Steve Edwards",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/roger-soper","bio/roger-soper","Roger Soper",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/chad-hester","bio/chad-hester","Chad Hester",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/heshan-wanigasooriya","bio/heshan-wanigasooriya","Heshan Wanigasooriya",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/edward-zwart","bio/ed-zwart","Ed Zwart",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/kathy-chavez","bio/kathy-chavez","Kathy Chavez",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/felipe-fidelix","bio/felipe-fidelix","Felipe Fidelix",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/jonas-flint","bio/jonas-flint","Jonas Flint",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/hally-turner","bio/hally-turner","Hally Turner",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/katelyn-cushman","bio/kate-cushman","Kate Cushman",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/lisa-lorhum","bio/lisa-lorhum","Lisa Lorhum",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/jessica-marland","bio/jessica-marland","Jessica Marland",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/anne-easterling","bio/anne-easterling","Anne Easterling",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/heinze-wegener","bio/heinze-wegener","Heinze Wegener",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/yao-gbanaglo","bio/yao-gbanaglo","Yao Gbanaglo",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/joseph-cheek","bio/joe-cheek","Joe Cheek",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/steven-jackson","bio/steve-jackson","Steve Jackson",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/nina-samberg","bio/nina-samberg","Nina Samberg",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/christopher-spiker","bio/chris-spiker","Chris Spiker",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/christina-young","bio/christina-young","Christina Young",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/trent-wyman","bio/trent-wyman","Trent Wyman",".field-name-field-user-bio",".field-name-field-user-position .field-item"
+"http://drupalconnect.com/team/karen-sironen","bio/karen-sironen","Karen Sironen",".field-name-field-user-bio",".field-name-field-user-position .field-item"

data/example/config.yml

@@ -1,11 +1,12 @@
-local_source: '' #use the web
-
 db_user: 'root'
 db_pass: 'root'
 db: 'flatfish_sample'
 
 # NOTE: these map to Drupal content types and AR database tables
 types:
+  Bio:
+    csv: '/home/tloudon/workspace/flatfish/example/bio.csv'
+    host: 'http://drupalconnect.com'
   Article:
     csv: '/home/tloudon/workspace/flatfish/example/article.csv'
     host: 'http://drupalconnect.com'
@@ -13,5 +14,9 @@ types:
     csv: '/home/tloudon/workspace/flatfish/example/page.csv'
     host: 'http://drupalconnect.com'
 
+# use the web, otherwise path to local HTML root
+local_source: ''
+
+#
 development:
   max_rows: 1000

data/flatfish.gemspec

@@ -5,7 +5,7 @@ require "flatfish"
 Gem::Specification.new do |s|
   s.name        = 'flatfish'
   s.version     = Flatfish::VERSION
-  s.date        = '2012-08-04'
+  s.date        = '2012-10-17'
   s.summary     = "Scrape web pages!"
   s.description = "flatfish accepts a CSV of URLS with CSS selectors prepping them for insert into drupal"
   s.authors     = ["Tim Loudon", "Mike Crittenden"]

data/lib/flatfish.rb

@@ -33,5 +33,5 @@ module Flatfish
     end
   end
 
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/flatfish/page.rb

@@ -68,7 +68,7 @@ module Flatfish
       @fields.each_with_index do |selectors, i|
         next if -1 == selectors
         html[@schema[i]] = ''
-        selectors.split('|').each do |selector|
+        selectors.split('&&').each do |selector|
           update_hrefs(selector)
           update_imgs(selector)
           if @doc.css(selector).nil? then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flatfish
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -93,6 +93,7 @@ files:
 - TODO.md
 - bin/flatfish
 - example/article.csv
+- example/bio.csv
 - example/config.yml
 - example/page.csv
 - flatfish.gemspec