leipzig 0.0.2 → 0.0.3

data/README.md

@@ -71,7 +71,6 @@ $ API_KEY='my-key' rake
 
 ## Todo
 
-* Support for whole API and all available resources
 * Refactoring
 * Maybe model layer instead of OpenStruct?
 

data/lib/leipzig/calendar.rb

@@ -0,0 +1,7 @@
+require 'leipzig/client'
+
+module Leipzig
+  class Calendar < Leipzig::Client
+    TYPES = [:events, :hosts, :venues]
+  end
+end

data/lib/leipzig/client.rb

@@ -4,20 +4,55 @@ require 'ostruct'
 
 module Leipzig
   class Client
+    API_URL   = 'http://www.apileipzig.de/api/v1'
+    KEYWORDS  = [:limit, :offset, :format]
+
     attr_reader :api_key
 
     def initialize(api_key)
       @api_key = api_key
-      @options = {}
+      @conditions = { :limit => 10, :name => 'leipzig', :api_key => @api_key }
+      register_methods
     end
 
     private
 
-    def request(uri, params)
-      result = JSON.parse RestClient.get(uri, :params => @options.merge(params))
+    def types
+      self.singleton_class.const_get(:TYPES)
+    end
+
+    def find(type, conditions = {})
+      raise "Type #{type} is invalid" unless types.include?(type.to_sym)
+      uri = "#{API_URL}/#{resource}/#{type}"
+
+      if has_search_param?(conditions)
+        uri += '/search'
+      end
+
+      request(uri, conditions)
+    end
+
+    def has_search_param?(conditions)
+      conditions.keys.select { |key| !KEYWORDS.include?(key) }.any?
+    end
+
+    def register_methods
+      types.each do |type|
+        self.class.send(:define_method, "find_#{type}".to_sym) do |*args|
+          find(type, *args)
+        end
+      end
+    end
+
+    def resource
+      self.class.to_s.split('::').last.downcase
+    end
+
+    def request(uri, conditions)
+      result = JSON.parse RestClient.get(uri, :params => @conditions.merge(conditions))
 
       if result.has_key? "error"
-        raise "Webservice returned error for uri '#{uri}': #{result['error']}"
+        raise "API returned error for uri '#{uri}': #{result['error']}"
       end
 
       result['data'].map { |entry| OpenStruct.new(entry) }

data/lib/leipzig/district.rb

@@ -0,0 +1,7 @@
+require 'leipzig/client'
+
+module Leipzig
+  class District < Leipzig::Client
+    TYPES = [:districts, :streets, :statistics, :ihkcompanies]
+  end
+end

data/lib/leipzig/mediahandbook.rb

@@ -2,24 +2,6 @@ require 'leipzig/client'
 
 module Leipzig
   class Mediahandbook < Leipzig::Client
-
-    TYPES   = [:companies, :branches, :people]
-    API_URL = 'http://www.apileipzig.de/api/v1/mediahandbook/'
-
-    TYPES.each do |type|
-      define_method "find_#{type}" do |*args|
-        find(type, *args)
-      end
-    end
-
-    def initialize(api_key)
-      super
-      @options = { :limit => 10, :name => 'leipzig', :api_key => @api_key }
-    end
-
-    def find(type, conditions)
-      raise "Type #{type} is invalid" unless TYPES.include?(type.to_sym)
-      request("#{API_URL}#{type}/search", conditions)
-    end
+    TYPES = [:companies, :branches, :people]
   end
 end

data/lib/leipzig/version.rb

@@ -1,3 +1,3 @@
 module Leipzig
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/leipzig.rb

@@ -1,3 +1,5 @@
 require 'leipzig/version'
 require 'leipzig/client'
 require 'leipzig/mediahandbook'
+require 'leipzig/calendar'
+require 'leipzig/district'

data/spec/leipzig/mediahandbook_spec.rb

@@ -17,6 +17,12 @@ describe 'Mediahandbook' do
   end
 
   it 'returns json representation of resource with default limit' do
+    data = client.find_companies
+    data.should be_instance_of(Array)
+    data.size.should eq(10)
+  end
+
+  it 'returns json representation of resource with given limit' do
     data = client.find_companies(:limit => LIMIT)
     data.should be_instance_of(Array)
     data.size.should eq(LIMIT)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leipzig
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -74,7 +74,9 @@ files:
 - Rakefile
 - leipzig.gemspec
 - lib/leipzig.rb
+- lib/leipzig/calendar.rb
 - lib/leipzig/client.rb
+- lib/leipzig/district.rb
 - lib/leipzig/mediahandbook.rb
 - lib/leipzig/version.rb
 - spec/leipzig/mediahandbook_spec.rb
@@ -94,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3565537231393772397
+      hash: -953058203614356815
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3565537231393772397
+      hash: -953058203614356815
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24