supermarket 0.0.3-universal-java → 0.0.4-universal-java

data/Rakefile

@@ -29,12 +29,12 @@ def gemspec_file
   "#{name}.gemspec"
 end
 
-def platform
-  eval(IO.read(gemspec_file)).platform.to_s
+def gemspec
+  @gemspec ||= eval(IO.read(gemspec_file))
 end
 
 def gem_file
-  "#{name}-#{version}-#{platform}.gem"
+  gemspec.file_name
 end
 
 def replace_header(head, header_name)
@@ -60,6 +60,7 @@ end
 #
 #############################################################################
 
+desc "release new version"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
@@ -68,7 +69,7 @@ task :release => :build do
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git tag v#{version}"
   sh "git push origin master --tags"
-  sh "gem push pkg/#{name}-#{version}.gem"
+  sh "gem push pkg/#{gem_file}"
 end
 
 desc "Builds the gem"

data/lib/supermarket.rb

@@ -1,5 +1,5 @@
 module Supermarket
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end
 
 require File.join(File.dirname(__FILE__), 'supermarket', 'session')

data/lib/supermarket/session.rb

@@ -18,12 +18,20 @@ module Supermarket
 
   class Session
     attr_reader :_session
+    @@order_type = {
+      :none     => Market::AppsRequest::OrderType.value_of(0),
+      :popular  => Market::AppsRequest::OrderType.value_of(1),
+      :newest   => Market::AppsRequest::OrderType.value_of(2),
+      :featured => Market::AppsRequest::OrderType.value_of(3)
+    }
+    def order_type(type_sym);@@order_type[type_sym];end
 
     def initialize(opts={})
       opts.merge!(self.class.config)
       @_session = MarketSession.new
+      @_session.getContext().setAndroidId("3000000000000000");
       if opts['authToken']
-        @_session.setAuthToken(opts['authToken'])
+        @_session.setAuthSubToken(opts['authToken'])
       else
         raise "Need login and password" unless opts['login'] && opts['password']
         @_session.login(opts['login'], opts['password'])
@@ -46,14 +54,35 @@ module Supermarket
       end
     end
 
+    def get_app(app_id)
+      request_builder = Market::AppsRequest.newBuilder()
+      request_builder.set_app_id(app_id).set_with_extended_info(true) 
+      execute(request_builder.build())
+    end
+
 
-    def search(query, extended=true, start=0, count=10)
-      request = Market::AppsRequest.newBuilder().
-        setQuery(query).
+    def search(query=nil, categid=nil,extended=true, start=0, count=10, order=:popular)
+      request_builder = Market::AppsRequest.newBuilder()
+
+      if query.nil? and !categid.nil?
+        request_builder.setCategoryId(categid)
+      elsif !query.nil? and categid.nil?
+        request_builder.setQuery(query)
+      elsif !query.nil? and !categid.nil?
+        request_builder.setQuery(query)
+        request_builder.setCategoryId(categid)
+      else
+        raise "query or category_id must not be nil."
+      end
+      
+      request_builder.
         setStartIndex(start).
         setEntriesCount(count).
-        setWithExtendedInfo(extended).build()
-      execute(request)
+        setWithExtendedInfo(extended).
+        setOrderType(order_type(order))
+
+
+      execute(request_builder.build())
     end
 
     def categories()

data/supermarket.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'supermarket'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.platform = 'universal-java'
 
   s.rubyforge_project = 'supermarket'
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Berkel"]
-  s.date = '2010-08-10'
+  s.date = '2011-01-23'
   s.default_executable = %q{market}
   s.description = %q{An unoffical/reverse engineered API for Android market.}
   s.email = %q{jan.berkel@gmail.com}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 3
-  version: 0.0.3
+    - 4
+  version: 0.0.4
 platform: universal-java
 authors: 
   - Jan Berkel
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +02:00
+date: 2011-01-23 00:00:00 +01:00
 default_executable: market
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: json-jruby
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -64,6 +65,7 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -71,6 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
           - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -80,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: supermarket
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: JRuby bindings for android-market-api