gnip 1.0.0 → 1.1.1

data/bin/gnip

@@ -633,7 +633,7 @@ Main {
             publisher = Gnip.publisher.for(publisher_name, :scope => scope)
             if publisher
               filter = publisher.filter.for(filter_name)
-              rule = filter.rule.list(:type => type, :value => value)
+              rule = filter.rule.for(:type => type, :value => value)
               rule.delete
               y rule
             else

data/gemspec.rb

@@ -1,47 +1,25 @@
-#! /usr/bin/env gem build
 
-require 'rubygems'
+  Gem::Specification::new do |spec|
+    spec.name = "gnip"
+    spec.version = "1.1.1"
+    spec.platform = Gem::Platform::RUBY
+    spec.summary = "gnip"
 
-Gem::Specification::new do |spec|
-  $VERBOSE = nil
+    spec.files = ["bin", "bin/gnip", "doc", "doc/api.html", "gemspec.rb", "gnip-ruby.gemspec", "lib", "lib/gnip", "lib/gnip/activity.rb", "lib/gnip/api.rb", "lib/gnip/arguments.rb", "lib/gnip/blankslate.rb", "lib/gnip/config.rb", "lib/gnip/filter.rb", "lib/gnip/list.rb", "lib/gnip/options.rb", "lib/gnip/orderedhash.rb", "lib/gnip/publisher.rb", "lib/gnip/resource.rb", "lib/gnip/template.rb", "lib/gnip/util.rb", "lib/gnip.rb", "Rakefile", "README", "sample", "sample/data", "sample/data/activity.yml", "test", "test/auth.rb", "test/config.yml", "test/data", "test/data/activity.xml", "test/data/activity_only_required.xml", "test/data/activity_with_payload.xml", "test/data/activity_with_place.xml", "test/data/activity_with_place_wo_bounds.xml", "test/data/activity_with_unbounded_media_urls.xml", "test/data/activity_without_bounds.xml", "test/helper.rb", "test/integration", "test/integration/auth.rb", "test/integration/publisher.rb", "test/lib", "test/lib/shoulda", "test/lib/shoulda/action_controller", "test/lib/shoulda/action_controller/helpers.rb", "test/lib/shoulda/action_controller/macros.rb", "test/lib/shoulda/action_controller/matchers", "test/lib/shoulda/action_controller/matchers/assign_to_matcher.rb", "test/lib/shoulda/action_controller/matchers/filter_param_matcher.rb", "test/lib/shoulda/action_controller/matchers/render_with_layout_matcher.rb", "test/lib/shoulda/action_controller/matchers/respond_with_content_type_matcher.rb", "test/lib/shoulda/action_controller/matchers/respond_with_matcher.rb", "test/lib/shoulda/action_controller/matchers/route_matcher.rb", "test/lib/shoulda/action_controller/matchers/set_session_matcher.rb", "test/lib/shoulda/action_controller/matchers/set_the_flash_matcher.rb", "test/lib/shoulda/action_controller/matchers.rb", "test/lib/shoulda/action_controller.rb", "test/lib/shoulda/action_mailer", "test/lib/shoulda/action_mailer/assertions.rb", "test/lib/shoulda/action_mailer.rb", "test/lib/shoulda/action_view", "test/lib/shoulda/action_view/macros.rb", "test/lib/shoulda/action_view.rb", "test/lib/shoulda/active_record", "test/lib/shoulda/active_record/assertions.rb", "test/lib/shoulda/active_record/helpers.rb", "test/lib/shoulda/active_record/macros.rb", "test/lib/shoulda/active_record/matchers", "test/lib/shoulda/active_record/matchers/allow_mass_assignment_of_matcher.rb", "test/lib/shoulda/active_record/matchers/allow_value_matcher.rb", "test/lib/shoulda/active_record/matchers/association_matcher.rb", "test/lib/shoulda/active_record/matchers/ensure_inclusion_of_matcher.rb", "test/lib/shoulda/active_record/matchers/ensure_length_of_matcher.rb", "test/lib/shoulda/active_record/matchers/have_db_column_matcher.rb", "test/lib/shoulda/active_record/matchers/have_index_matcher.rb", "test/lib/shoulda/active_record/matchers/have_named_scope_matcher.rb", "test/lib/shoulda/active_record/matchers/have_readonly_attribute_matcher.rb", "test/lib/shoulda/active_record/matchers/validate_acceptance_of_matcher.rb", "test/lib/shoulda/active_record/matchers/validate_numericality_of_matcher.rb", "test/lib/shoulda/active_record/matchers/validate_presence_of_matcher.rb", "test/lib/shoulda/active_record/matchers/validate_uniqueness_of_matcher.rb", "test/lib/shoulda/active_record/matchers/validation_matcher.rb", "test/lib/shoulda/active_record/matchers.rb", "test/lib/shoulda/active_record.rb", "test/lib/shoulda/assertions.rb", "test/lib/shoulda/autoload_macros.rb", "test/lib/shoulda/context.rb", "test/lib/shoulda/helpers.rb", "test/lib/shoulda/macros.rb", "test/lib/shoulda/private_helpers.rb", "test/lib/shoulda/proc_extensions.rb", "test/lib/shoulda/rails.rb", "test/lib/shoulda/rspec.rb", "test/lib/shoulda/tasks", "test/lib/shoulda/tasks/list_tests.rake", "test/lib/shoulda/tasks/yaml_to_shoulda.rake", "test/lib/shoulda/tasks.rb", "test/lib/shoulda/test_unit.rb", "test/lib/shoulda.rb", "test/lib/xmlsimple.rb", "test/loader.rb", "test/unit", "test/unit/activity.rb", "test/unit/util.rb", "TODO"]
+    spec.executables = ["gnip"]
+    
+    spec.require_path = "lib"
 
-  shiteless = lambda do |list|
-    list.delete_if do |file|
-      file =~ %r/\.git/ or
-      file =~ %r/\.svn/ or
-      file =~ %r/\.tmp/
-    end
-  end
-
-  spec.name = $lib
-  spec.version = $version
-  spec.platform = Gem::Platform::RUBY
-  spec.summary = $lib
-
-  spec.files = shiteless[Dir::glob("**/**")]
-  spec.executables = shiteless[Dir::glob("bin/*")].map{|exe| File::basename(exe)}
-  
-  spec.require_path = "lib" 
+    spec.has_rdoc = true
+    spec.test_files = nil
+    #spec.add_dependency 'lib', '>= version'
+    #spec.add_dependency 'fattr'
 
-  spec.has_rdoc = true #File::exist? "doc" 
-  # spec.test_suite_file = "test/#{ $lib }.rb" if File::file?("test/#{ $lib }.rb")
-  spec.add_dependency 'rest-client'
-  spec.add_dependency 'nokogiri'
-  spec.add_dependency 'threadify'
-  spec.add_dependency 'tagz', '>= 5.0.1'
-
-  spec.extensions << "extconf.rb" if File::exists? "extconf.rb"
-
-  spec.rubyforge_project = 'gnip'
-  spec.author = "Ara T. Howard"
-  spec.email = "ara.t.howard@gmail.com"
-  spec.homepage = "http://gnip.com"
-end
+    spec.extensions.push(*["rakefile", "Rakefile"])
 
+    spec.rubyforge_project = 'codeforpeople'
+    spec.author = "Ara T. Howard"
+    spec.email = "ara.t.howard@gmail.com"
+    spec.homepage = "http://github.com/ahoward/gnip/tree/master"
+  end
 
-BEGIN{ 
-  Dir.chdir(File.dirname(__FILE__))
-  $lib = 'gnip'
-  Kernel.load "./lib/#{ $lib }.rb"
-  $version = Gnip.version
-}

data/gnip-ruby.gemspec

@@ -0,0 +1,25 @@
+
+  Gem::Specification::new do |spec|
+    spec.name = "gnip"
+    spec.version = "1.1.1"
+    spec.platform = Gem::Platform::RUBY
+    spec.summary = "gnip"
+
+    spec.files = ["bin", "bin/gnip", "doc", "doc/api.html", "gemspec.rb", "gnip-ruby.gemspec", "lib", "lib/gnip", "lib/gnip/activity.rb", "lib/gnip/api.rb", "lib/gnip/arguments.rb", "lib/gnip/blankslate.rb", "lib/gnip/config.rb", "lib/gnip/filter.rb", "lib/gnip/list.rb", "lib/gnip/options.rb", "lib/gnip/orderedhash.rb", "lib/gnip/publisher.rb", "lib/gnip/resource.rb", "lib/gnip/template.rb", "lib/gnip/util.rb", "lib/gnip.rb", "Rakefile", "README", "sample", "sample/data", "sample/data/activity.yml", "test", "test/auth.rb", "test/config.yml", "test/data", "test/data/activity.xml", "test/data/activity_only_required.xml", "test/data/activity_with_payload.xml", "test/data/activity_with_place.xml", "test/data/activity_with_place_wo_bounds.xml", "test/data/activity_with_unbounded_media_urls.xml", "test/data/activity_without_bounds.xml", "test/helper.rb", "test/integration", "test/integration/auth.rb", "test/integration/publisher.rb", "test/lib", "test/lib/shoulda", "test/lib/shoulda/action_controller", "test/lib/shoulda/action_controller/helpers.rb", "test/lib/shoulda/action_controller/macros.rb", "test/lib/shoulda/action_controller/matchers", "test/lib/shoulda/action_controller/matchers/assign_to_matcher.rb", "test/lib/shoulda/action_controller/matchers/filter_param_matcher.rb", "test/lib/shoulda/action_controller/matchers/render_with_layout_matcher.rb", "test/lib/shoulda/action_controller/matchers/respond_with_content_type_matcher.rb", "test/lib/shoulda/action_controller/matchers/respond_with_matcher.rb", "test/lib/shoulda/action_controller/matchers/route_matcher.rb", "test/lib/shoulda/action_controller/matchers/set_session_matcher.rb", "test/lib/shoulda/action_controller/matchers/set_the_flash_matcher.rb", "test/lib/shoulda/action_controller/matchers.rb", "test/lib/shoulda/action_controller.rb", "test/lib/shoulda/action_mailer", "test/lib/shoulda/action_mailer/assertions.rb", "test/lib/shoulda/action_mailer.rb", "test/lib/shoulda/action_view", "test/lib/shoulda/action_view/macros.rb", "test/lib/shoulda/action_view.rb", "test/lib/shoulda/active_record", "test/lib/shoulda/active_record/assertions.rb", "test/lib/shoulda/active_record/helpers.rb", "test/lib/shoulda/active_record/macros.rb", "test/lib/shoulda/active_record/matchers", "test/lib/shoulda/active_record/matchers/allow_mass_assignment_of_matcher.rb", "test/lib/shoulda/active_record/matchers/allow_value_matcher.rb", "test/lib/shoulda/active_record/matchers/association_matcher.rb", "test/lib/shoulda/active_record/matchers/ensure_inclusion_of_matcher.rb", "test/lib/shoulda/active_record/matchers/ensure_length_of_matcher.rb", "test/lib/shoulda/active_record/matchers/have_db_column_matcher.rb", "test/lib/shoulda/active_record/matchers/have_index_matcher.rb", "test/lib/shoulda/active_record/matchers/have_named_scope_matcher.rb", "test/lib/shoulda/active_record/matchers/have_readonly_attribute_matcher.rb", "test/lib/shoulda/active_record/matchers/validate_acceptance_of_matcher.rb", "test/lib/shoulda/active_record/matchers/validate_numericality_of_matcher.rb", "test/lib/shoulda/active_record/matchers/validate_presence_of_matcher.rb", "test/lib/shoulda/active_record/matchers/validate_uniqueness_of_matcher.rb", "test/lib/shoulda/active_record/matchers/validation_matcher.rb", "test/lib/shoulda/active_record/matchers.rb", "test/lib/shoulda/active_record.rb", "test/lib/shoulda/assertions.rb", "test/lib/shoulda/autoload_macros.rb", "test/lib/shoulda/context.rb", "test/lib/shoulda/helpers.rb", "test/lib/shoulda/macros.rb", "test/lib/shoulda/private_helpers.rb", "test/lib/shoulda/proc_extensions.rb", "test/lib/shoulda/rails.rb", "test/lib/shoulda/rspec.rb", "test/lib/shoulda/tasks", "test/lib/shoulda/tasks/list_tests.rake", "test/lib/shoulda/tasks/yaml_to_shoulda.rake", "test/lib/shoulda/tasks.rb", "test/lib/shoulda/test_unit.rb", "test/lib/shoulda.rb", "test/lib/xmlsimple.rb", "test/loader.rb", "test/unit", "test/unit/activity.rb", "test/unit/util.rb", "TODO"]
+    spec.executables = ["gnip"]
+    
+    spec.require_path = "lib"
+
+    spec.has_rdoc = true
+    spec.test_files = nil
+    #spec.add_dependency 'lib', '>= version'
+    #spec.add_dependency 'fattr'
+
+    spec.extensions.push(*["rakefile", "Rakefile"])
+
+    spec.rubyforge_project = 'codeforpeople'
+    spec.author = "Ara T. Howard"
+    spec.email = "ara.t.howard@gmail.com"
+    spec.homepage = "http://github.com/ahoward/gnip/tree/master"
+  end
+

data/lib/gnip/activity.rb

@@ -269,6 +269,8 @@ module Gnip
         @payload = Payload.for(value)
       end
 
+    attr_accessor :gnip_resource_uri
+
     def initialize(options = {})
       options = Gnip.options_for(options)
       options.each{|key, value| send("#{ key }=", value)}

data/lib/gnip/filter.rb

@@ -200,9 +200,11 @@ module Gnip
     def to_xml(*args)
       tagz {
         filter_(:name => name, :fullData => !!full_data){
+          postURL_{ post_url } if post_url
           rules.each do |rule|
             rule_(:type => rule.type){ rule.value }
           end
+          nil
         }
       }
     end
@@ -284,6 +286,11 @@ module Gnip
         rule
       end
 
+      def for(*args)
+        rule = Rule.for(*args)
+        list(:type => rule.type, :value => rule.value)
+      end
+
       def delete options = {}
         list(options).delete(:filter => filter)
       end

data/lib/gnip/publisher.rb

@@ -212,6 +212,7 @@ module Gnip
 
       filter = options.getopt(:filter)
       filter = filter.value if(filter and filter.respond_to?(:value))
+      filter = filter.name if(filter and filter.respond_to?(:name))
 
       buckets =
         if thru
@@ -227,6 +228,10 @@ module Gnip
           end
         end
 
+      buckets.map! do |bucket|
+        bucket.is_a?(Time) ? bucket.strftime('%Y%m%d%H%M') : bucket
+      end
+
       activities = []
 
       msg = buckets.size > 1 ? 'threadify' : 'each'
@@ -235,8 +240,10 @@ module Gnip
         path = "#{ style }/#{ bucket }.xml"
         path = "filters/#{ filter }/#{ path }" if filter
         xml = resource[path].get
-        list = Activity.list_from_xml(xml, &block)
-        activities.push(*list) unless block
+        Activity.list_from_xml(xml) do |activity|
+          activity.gnip_resource_uri = resource[path].uri
+          block ? block.call(activity) : activities.push(activity)
+        end
       end
 
       activities unless block

data/lib/gnip/resource.rb

@@ -165,7 +165,7 @@ module Gnip
         def wrapping_errors
           begin
             yield
-          rescue Exception => error
+          rescue => error
             message = []
             message << error.message if error.respond_to?(:message) rescue nil
             message << error.response.body if error.respond_to?(:response) rescue nil

data/lib/gnip.rb

@@ -43,7 +43,7 @@
 # gnip libs
 #
   module Gnip
-    Version = '1.0.0'
+    Version = '1.1.1'
 
     def version
       Gnip::Version

data/rakefile

@@ -0,0 +1,53 @@
+task 'default' => 'test:all'
+
+namespace 'test' do
+  desc 'run all tests'
+    task 'all' => %w[ unit integration ] do
+    end
+
+  desc 'run unit tests'
+    task 'unit' do
+      %w[
+        activity
+      ].each do |basename|
+        test_loader "test/unit/#{ basename }.rb"
+      end
+    end
+
+  desc 'run integration tests'
+    task 'integration' do
+      %w[
+        auth
+        publisher
+      ].each do |basename|
+        test_loader "test/integration/#{ basename }.rb", :require_auth => true
+      end
+    end
+end
+
+task 'test' => 'test:all' do
+end
+
+namespace 'gem' do
+  task 'build' do
+    sh 'gemspec.rb'
+  end
+  task 'release' => 'build' do
+    gem = Dir['gnip*.gem'].sort.last or abort('no gem!')
+    version = gem[%r/[\d.]+/]
+    command = "rubyforge login && rubyforge add_release gnip 'gnip' '#{ version }' '#{ gem }'"
+    sh command
+  end
+end
+
+BEGIN {
+  Dir.chdir(File.dirname(__FILE__))
+  ENV['PATH'] = [ '.', './bin/', ENV['PATH'] ].join(File::PATH_SEPARATOR)
+
+  def test_loader basename, options = {}
+    auth = '-r test/auth.rb ' if options[:require_auth]
+    command = "ruby -r test/loader.rb #{ auth }#{ basename }"
+    STDERR.print "\n==== TEST ====\n\n  #{ command }\n\n==============\n\n"
+    system command or abort("#{ command } # FAILED WITH #{ $?.inspect }")
+  end
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gnip
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,55 +9,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-27 00:00:00 -06:00
+date: 2009-06-08 00:00:00 -06:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: threadify
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: tagz
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 5.0.1
-    version: 
+dependencies: []
+
 description: 
 email: ara.t.howard@gmail.com
 executables: 
 - gnip
-extensions: []
-
+extensions: 
+- rakefile
+- Rakefile
 extra_rdoc_files: []
 
 files: 
@@ -66,8 +28,7 @@ files:
 - doc
 - doc/api.html
 - gemspec.rb
-- gnip-0.4.2.gem
-- gnip-1.0.0.gem
+- gnip-ruby.gemspec
 - lib
 - lib/gnip
 - lib/gnip/activity.rb
@@ -101,7 +62,6 @@ files:
 - test/data/activity_with_unbounded_media_urls.xml
 - test/data/activity_without_bounds.xml
 - test/helper.rb
-- test/helper.rb.bak
 - test/integration
 - test/integration/auth.rb
 - test/integration/publisher.rb
@@ -170,7 +130,7 @@ files:
 - test/unit/util.rb
 - TODO
 has_rdoc: true
-homepage: http://gnip.com
+homepage: http://github.com/ahoward/gnip/tree/master
 post_install_message: 
 rdoc_options: []
 
@@ -190,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: gnip
+rubyforge_project: codeforpeople
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2

data/test/helper.rb.bak

@@ -1,28 +0,0 @@
-module Gnip
-  module Test
-    module Helper
-      def xml_cmp(a, b)
-        eq_all_but_zero = Object.new.instance_eval do
-          def ==(other)
-            Integer(other) == 0 ? false : true
-          end
-          self
-        end
-        a = XmlSimple.xml_in(a.to_s, 'normalisespace' => eq_all_but_zero)
-        b = XmlSimple.xml_in(b.to_s, 'normalisespace' => eq_all_but_zero)
-        a == b
-      end
-    end
-  end
-end
-
-module Kernel
-private
-  def Test(*args, &block)
-    Class.new(::Test::Unit::TestCase) do
-      include Gnip::Test::Helper
-      args.push 'default' if args.empty?
-      context(*args, &block)
-    end
-  end
-end