itunes-search 0.2.6 → 0.3.0

data/.gitignore

@@ -0,0 +1,21 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.3.0

data/itunes-search.gemspec

@@ -1,44 +1,50 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{itunes-search}
-  s.version = "0.2.6"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jeff durand"]
-  s.date = %q{2011-06-15}
+  s.date = %q{2013-01-08}
   s.description = %q{Pretty simple interface for the itunes search api will return results as array of results objects and offer reasonable accessor methods variables}
   s.email = %q{jeff.durand@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+     "README.rdoc"
   ]
   s.files = [
     ".document",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "itunes-search.gemspec",
-    "lib/itunes-search.rb",
-    "lib/itunes-search/base.rb",
-    "lib/itunes-search/result.rb",
-    "lib/itunes-search/search.rb",
-    "test/helper.rb",
-    "test/test_itunes-search.rb"
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "itunes-search.gemspec",
+     "lib/itunes-search.rb",
+     "lib/itunes-search/base.rb",
+     "lib/itunes-search/search.rb",
+     "test/helper.rb",
+     "test/test_itunes-search.rb"
   ]
   s.homepage = %q{http://github.com/johnnyiller/itunes-search}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Itunes Search}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_itunes-search.rb"
+  ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])

data/lib/itunes-search.rb

@@ -7,11 +7,7 @@ require "cgi"
 
 class Hash
   def to_url_params
-    elements = []
-    keys.size.times do |i|
-      elements << "#{CGI::escape(keys[i])}=#{CGI::escape(values[i])}"
-    end
-    elements.join('&')
+    collect { |key,value| "#{CGI::escape(key)}=#{CGI::escape(value)}" }.join('&')
   end 
 end
  
@@ -19,4 +15,3 @@ end
 directory = File.expand_path(File.dirname(__FILE__))
 require File.join(directory,"itunes-search", "base")
 require File.join(directory,"itunes-search","search")
-require File.join(directory,"itunes-search","result")

data/lib/itunes-search/base.rb

@@ -1,11 +1,21 @@
 module ItunesSearch 
 
-  ENDPOINT = "http://ax.phobos.apple.com.edgesuite.net/WebObjects/MZStoreServices.woa/wa/wsSearch"
-  
+
+  @endpoint = "http://ax.phobos.apple.com.edgesuite.net/WebObjects/MZStoreServices.woa/wa/wsSearch" 
+
+  def self.endpoint=(ep)
+    @endpoint = ep
+  end
+  def self.endpoint
+    @endpoint
+  end
+
   class Base
    
     def search(*args)
       return ItunesSearch::Search.new(*args)  
     end  
+
   end
-end
+
+end

data/lib/itunes-search/search.rb

@@ -1,46 +1,33 @@
+require 'ostruct'
 module ItunesSearch
   
   class Search
     attr_accessor :options, :result_hash, :json
-    alias :original_method_missing :method_missing
     
     def initialize(*args)
-      self.options={}
-      args.each do |arg|
-        self.options.merge!(arg)
-      end
+      @options = args.inject({}) { |result, element| element.merge(result); element  }
     end
-    def method_missing(method_name,*args)
-      if args.size == 1
-        self.options.merge!({"#{method_name.to_s.gsub("=","")}"=>args.first.to_s})
-        return self.options["#{method_name.to_s.gsub("=","")}"]
-      elsif args.size == 0
-        if self.options.keys.include?(method_name.to_s)
-          return self.options["#{method_name.to_s.gsub("=","")}"]
-        end
-      end
-      original_method_missing method_name, args
+    
+    def results 
+      ra = []
+      ra = to_hash["results"].collect {|r| OpenStruct.new(r) } unless to_hash["results"].empty?
+      return ra
     end
+
+    protected
     def fetch
-      #puts "#{ItunesSearch::ENDPOINT}?#{self.options.to_url_params}"
-      uri = URI.parse("#{ItunesSearch::ENDPOINT}?#{self.options.to_url_params}")
-      resp = Net::HTTP.start(uri.host,uri.port) do |http|
+      uri = URI.parse("#{itunes_endpoint}?#{options.to_url_params}")
+      @json ||= Net::HTTP.start(uri.host,uri.port) do |http|
         http.open_timeout=5
         http.read_timeout=5
-        http.get("#{uri.path}?#{self.options.to_url_params}")
-      end
-      self.json=resp.body
+        http.get("#{uri.path}?#{options.to_url_params}")
+      end.body
     end
-    def results 
-      ra = []
-      ra = self.to_hash["results"].collect {|r| ItunesSearch::Result.new(r)} unless self.to_hash["results"].empty?
-      puts ra.inspect
-      return ra
-    end
-    
     def to_hash
-      self.result_hash ||= JSON.parse(fetch)
+      @result_hash ||= JSON.parse(fetch)
+    end
+    def itunes_endpoint
+      ItunesSearch.endpoint
     end
-    
   end
-end
+end

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: itunes-search
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.6
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - jeff durand
@@ -10,16 +14,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 Z
+date: 2013-01-08 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -34,6 +40,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -41,36 +48,39 @@ files:
 - itunes-search.gemspec
 - lib/itunes-search.rb
 - lib/itunes-search/base.rb
-- lib/itunes-search/result.rb
 - lib/itunes-search/search.rb
 - test/helper.rb
 - test/test_itunes-search.rb
+has_rdoc: true
 homepage: http://github.com/johnnyiller/itunes-search
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Itunes Search
-test_files: []
-
+test_files: 
+- test/helper.rb
+- test/test_itunes-search.rb

data/lib/itunes-search/result.rb

@@ -1,20 +0,0 @@
-module ItunesSearch
-  
-  class Result
-    attr_accessor :attributes
-    alias :original_method_missing :method_missing
-    def initialize(hash)
-      self.attributes = {}
-      self.attributes.merge!(hash)
-    end
-    
-    def method_missing(method_name,*args)
-      if self.attributes.keys.include?(method_name.to_s)
-        return self.attributes["#{method_name.to_s}"]
-      else
-        original_method_missing method_name, args
-      end
-    end
-  end
-  
-end