lonely_coder 0.1.0 → 0.1.1

data/README.mdown

@@ -40,6 +40,12 @@ How does it work?
 -----------------------------
 You'll need an OKCupid account (it's free) because most of the site is behind authentication.  You can create a new connection to the site.
 
+Install as a gem
+
+    gem install lonely_coder
+
+Use your account
+
     require 'lonely_coder'
     okc = OKCupid.new('yourusername', 'yourpassword')
     

data/lib/lonely_coder/authentication.rb

@@ -12,7 +12,7 @@ class OKCupid
         username: username,
         password: password
       })
-      
+
       @success = browser.page.uri.path == '/home'
       
       restore_default_parser(browser)
@@ -35,7 +35,7 @@ class OKCupid
     # We're only using page uri to determine successful login, so
     # there's not a lot of value in passing a body string to nokogiri
     def initialize(uri = nil, response = nil, body = nil, code =nil)
-      super(uri, response, nil, code)
+      super(uri, response, '', code)
     end
   end
 end

data/lib/lonely_coder/magic_constants.rb

@@ -66,7 +66,7 @@ class OKCupid
       # "v_looks" => 23,
       # "v_personality" => 25,
       
-      # added by us
+      # filters
       'match_limit' => 'match_limit',
       'order_by' => 'order_by',
       'location' => 'location'

data/lib/lonely_coder/search.rb

@@ -22,23 +22,62 @@ class OKCupid
     end
     
     def parse(options)
-      combine_ages(options)
       check_for_required_options(options)
-      remove_match_limit(options)
+      
+      options[:age] = combine_ages(options)
+      
       
       @filters = []
+      @parameters = []
+      
       options.each do |name,value|
-        
-        if OKCupid.const_defined?("#{name.to_s.camelize}Filter")
-          @filters << OKCupid.const_get("#{name.to_s.camelize}Filter").new(name, value)
-        else
-          @filters << Filter.new(name, value)
-        end
+        self.send("add_#{name}_option", value)
+        # if OKCupid.const_defined?("#{name.to_s.camelize}Filter")
+        #   @filters << OKCupid.const_get("#{name.to_s.camelize}Filter").new(name, value)
+        # else
+        #   @filters << Filter.new(name, value)
+        # end
       end
     end
     
-    def remove_match_limit(options)
-      @match_limit = options.delete(:match_limit)
+    def add_order_by_option(value)
+      @parameters << OrderByParameter.new(value)
+    end
+    
+    def add_last_login_option(value)
+      @filters << Filter.new('last_login', value)
+    end
+    
+    def add_location_option(value)
+      @parameters << LocationParameter.new(value)
+    end
+    
+    def add_radius_option(value)
+      @filters << RadiusFilter.new('radius', value)
+    end
+    
+    def add_require_photo_option(value)
+      @filters << RequirePhotoFilter.new('require_photo', value)
+    end
+    
+    def add_relationship_status_option(value)
+      @filters << Filter.new('relationship_status', value)
+    end
+    
+    def add_gentation_option(value)
+      @filters << Filter.new('gentation', value)
+    end
+    
+    def add_age_option(value)
+      @filters << AgeFilter.new('age', value)
+    end
+    
+    def add_pagination_option(value)
+      @parameters << @pagination = Paginator.new(value)
+    end
+    
+    def add_match_limit_option(value)
+      # TODO.
     end
     
     def check_for_required_options(options)
@@ -63,6 +102,10 @@ class OKCupid
     # relationship_status 'single'
     def defaults
       {
+        :pagination => {
+          :page => 1,
+          :per_page => 10
+        },
         :match_limit => 80,
         :min_age => 18,
         :max_age => 99,
@@ -78,24 +121,87 @@ class OKCupid
     def results
       return @results if @results
       
-      page = @browser.get(url)
+      @browser.pluggable_parser.html = SearchPaginationParser
+      page = @browser.get(ajax_url)
+      
       @results = page.search('.match_row').collect do |node|
         OKCupid::Profile.from_search_result(node)
       end
+      
+      @browser.pluggable_parser.html = Mechanize::Page
+      
+      @results
+    end
+    
+    # no idea what the following parameters do. They don't appear to have 
+    # an effect:
+    # sort_type=0
+    # fromWhoOnline=0
+    # update_prefs=1
+    # using_saved_search=0
+    # mygender=m
+    # no idea what the following parameters do, but without them, the search
+    # behaves erratically
+    # &timekey=1
+    # &custom_search=0
+    def magic_params_not_truly_understood
+      "timekey=1&custom_search=0"
     end
     
     def load_next_page
       @browser.pluggable_parser.html = SearchPaginationParser
-      page = @browser.get("#{url}&low=11&count=10&ajax_load=1")
+      
+      page = @browser.get("#{ajax_url}&#{@pagination.next.to_param}")
+      
       @results += page.search('.match_row').collect do |node|
         OKCupid::Profile.from_search_result(node)
       end
+      
       @browser.pluggable_parser.html = Mechanize::Page
+      
       self
     end
     
     def url
-      '/match?' + filters.compact.to_enum(:each_with_index).map {|filter,index| filter.to_param(index+1)}.join('&')
+      "/match?#{filters_as_query}&#{parameters_as_query}&#{magic_params_not_truly_understood}"
+    end
+    
+    def ajax_url
+      "#{url}&ajax_load=1"
+    end
+    
+    def parameters_as_query
+      @parameters.collect {|param| param.to_param }.join('&')
+    end
+    
+    def filters_as_query
+      filters.compact.to_enum(:each_with_index).map {|filter,index| filter.to_param(index+1)}.join('&')
+    end
+  end
+  
+  # used to create the pagination part of a search url:
+  # low=1&count=10&ajax_load=1
+  # where low is the start value
+  # count is the number of items per page
+  class Paginator
+    attr_reader :page, :per_page
+    
+    def initialize(options)
+      @per_page = options[:per_page]
+      @page = options[:page]
+    end
+    
+    def low
+      @low = ((@page - 1) * @per_page) + 1
+    end
+    
+    def next
+      @page +=1
+      self
+    end
+    
+    def to_param
+      "low=#{low}&count=#{@per_page}"
     end
   end
   
@@ -137,13 +243,12 @@ class OKCupid
     end
   end
   
-  class LocationFilter < Filter
-    def lookup(value)
-      ''
+  class LocationParameter
+    def initialize(value)
+      @value = value
     end
     
-    def to_param(n)
-      
+    def to_param
       # to do: 'anywhere' needs to remove the radius filter
       if @value.is_a?(String)
         if @value.downcase == 'near me'
@@ -156,24 +261,18 @@ class OKCupid
       end
     end
   end
-  
-  class OrderByFilter < Filter
-    def to_param(n)
+
+  class OrderByParameter
+    def initialize(value)
+      @value = value
+      @encoded_value = MagicNumbers::OrderBy[value.downcase]
+    end
+    
+    def to_param
       "matchOrderBy=#{@encoded_value}"
     end
   end
-  
-  # we fake this by paginating results ourselves.
-  # class MatchLimitFilter < Filter
-  #   def lookup(value)
-  #     'MATCH'
-  #   end
-  #   
-  #   def to_param(n)
-  #     nil
-  #   end
-  # end
-  
+
   class RequirePhotoFilter < Filter
     def lookup(value)
       value ? 1 : 0

data/lib/lonely_coder.rb

@@ -11,7 +11,7 @@ require 'mechanize'
 
 class OKCupid
   BaseUrl = 'http://www.okcupid.com'
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   
   def initialize(username=nil, password=nil)
     @browser = Mechanize.new 

data/lonely_coder.gemspec

@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |s|
+  s.name        = "lonely_coder"
+  s.version     = '0.1.1'
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Trek Glowacki"]
+  s.email       = ["trek.glowacki@gmail.com"]
+  s.homepage    = "http://github.com/trek/lonely_coder"
+  s.summary     = %q{A gem for interacting with OKCupid as if it had an API}
+  s.description = %q{A gem for interacting with OKCupid as if it had an API.}
+
+  s.add_dependency 'mechanize', '= 2.0.1'
+  s.add_dependency 'activesupport', '>= 3.2.1'
+
+  s.post_install_message = %q{
+    
+    
+    
+    ,d88b.d88b,
+    88888888888
+    `Y8888888Y'
+      `Y888Y'
+        `Y'
+    
+        Good luck out there.
+    
+    
+  }
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end