ratsit 0.0.1 → 0.0.2

data/lib/ratsit/version.rb

@@ -1,3 +1,4 @@
+
 module Ratsit
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/ratsit.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Stefan Nyman"]
   spec.email         = ["stefan@qoorp.com"]
 
-  spec.summary       = "Ratsit searches..."
-  spec.description   = "Ratsit searches..."
+  spec.summary       = "Perform Ratsit searches for persons and companies."
+  spec.description   = "Can search using either the open api endpoints or by using an api key. Search methods: OpenPersonSearch, OpenCompanySearch, SearchCompanies, SearchPersons, SearchOnePerson."
   spec.homepage      = "http://github.com/qoorp/ratsit"
   spec.license       = "MIT"
 
@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.2"
 
   spec.add_runtime_dependency "faraday", "~> 0.9.2"
+  spec.add_runtime_dependency "savon", "~> 2.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ratsit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stefan Nyman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
-description: Ratsit searches...
+- !ruby/object:Gem::Dependency
+  name: savon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+description: 'Can search using either the open api endpoints or by using an api key.
+  Search methods: OpenPersonSearch, OpenCompanySearch, SearchCompanies, SearchPersons,
+  SearchOnePerson.'
 email:
 - stefan@qoorp.com
 executables: []
@@ -83,12 +99,22 @@ files:
 - bin/setup
 - lib/ratsit.rb
 - lib/ratsit/errors.rb
-- lib/ratsit/filters.rb
+- lib/ratsit/filter/filter.rb
+- lib/ratsit/filter/filter_company.rb
+- lib/ratsit/filter/filter_get_annual_report.rb
+- lib/ratsit/filter/filter_get_companies.rb
+- lib/ratsit/filter/filter_get_company_information_package.rb
+- lib/ratsit/filter/filter_get_person_information_package.rb
+- lib/ratsit/filter/filter_person.rb
+- lib/ratsit/filter/filter_search_one_person.rb
+- lib/ratsit/filter/filter_search_persons.rb
 - lib/ratsit/monkey.rb
-- lib/ratsit/package.rb
-- lib/ratsit/person.rb
-- lib/ratsit/request.rb
-- lib/ratsit/search_type.rb
+- lib/ratsit/request/open_request.rb
+- lib/ratsit/request/request.rb
+- lib/ratsit/request/request_get_companies.rb
+- lib/ratsit/request/request_search_one_person.rb
+- lib/ratsit/request/request_search_persons.rb
+- lib/ratsit/request/token_request.rb
 - lib/ratsit/version.rb
 - ratsit.gemspec
 homepage: http://github.com/qoorp/ratsit
@@ -115,5 +141,5 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: Ratsit searches...
+summary: Perform Ratsit searches for persons and companies.
 test_files: []

data/lib/ratsit/filters.rb

@@ -1,155 +0,0 @@
-
-require 'ratsit/errors'
-require 'json'
-
-module Ratsit
-
-  # Person filters
-  FILTER_MARRIED = 'Married'
-  FILTER_UNMARRIED = 'Unmarried'
-  FILTER_MALE = 'Male'
-  FILTER_FEMALE = 'Female'
-  FILTER_COMPANY_ENGAGEMENT = 'CompanyEngagement'
-  FILTER_NO_COMPANY_ENGAGEMENT = 'NoCompanyEngagement'
-  FILTER_AGE_FROM = 'AgeFrom'
-  FILTER_AGE_TO = 'AgeTo'
-
-  # Company filters
-  FILTER_AB = 'AB'
-  FILTER_EF = 'EF'
-  FILTER_HB = 'HB'
-  FILTER_OTHER = 'Other'
-
-
-  class RatsitFilter
-
-    def initialize()
-      @active_filters = {}
-      @filter_defaults = {}
-    end
-
-    def active_filters
-      return (@active_filters.nil?)? nil: @active_filters
-    end
-
-    def to_json
-      af = self.active_filters
-      return '{}' if af.nil?
-      af.to_json
-    end
-
-    def update(filter_key='', filter_value)
-      #puts "update #{filter_key}: #{filter_value}"
-      if !filter_key.is_a?(String)
-        raise RatsitFilterError, 'Invalid filter key'
-      end
-      if filter_value.nil?
-        raise RatsitFilterError, 'Invalid filter value'
-      end
-      if !@active_filters.has_key?(filter_key)
-        raise RatsitFilterError, 'Non-existent filter key'
-      end
-      @curr_filters = Marshal.load(Marshal.dump(@active_filters))
-      @curr_filters[filter_key] = filter_value
-      @active_filters = validate_filters(@filter_defaults, @curr_filters)
-    end
-
-    def reset(filter_name='')
-      if !filter_name.is_a?(String)
-        raise RatsitFilterError, 'Invalid filter key'
-      end
-      if !@filter_defaults.has_key?(filter_name)
-        raise RatsitFilterError, 'Non-existent filter key'
-      end
-      @active_filters[filter_name] = @filter_defaults[filter_name][:default]
-    end
-
-  end
-
-  class PersonFilter < RatsitFilter
-    include Ratsit
-    #{"Married":true,"Unmarried":true,"Male":true,"Female":true,"CompanyEngagement":true,"NoCompanyEngagement":true,"AgeFrom":"0","AgeTo":"150"}
-    def initialize(filters={})
-      super()
-      @filter_defaults = {
-          FILTER_MARRIED => {:parse => method(:parse_bool), :default => true},
-          FILTER_UNMARRIED => {:parse => method(:parse_bool), :default => true},
-          FILTER_MALE => {:parse => method(:parse_bool), :default => true},
-          FILTER_FEMALE => {:parse => method(:parse_bool), :default => true},
-          FILTER_COMPANY_ENGAGEMENT => {:parse => method(:parse_bool), :default => true},
-          FILTER_NO_COMPANY_ENGAGEMENT => {:parse => method(:parse_bool), :default => true},
-          FILTER_AGE_FROM => {:parse => method(:parse_age), :default => '0'},
-          FILTER_AGE_TO => {:parse => method(:parse_age), :default => '150'}
-      }
-      @active_filters = validate_filters(@filter_defaults, filters)
-    end
-  end
-
-  class CompanyFilter < RatsitFilter
-    include Ratsit
-    #{"AB":true,"EF":true,"HB":true,"Other":true}
-    def initialize(filters={})
-      super()
-      @filter_defaults = {
-        FILTER_AB => {:parse => method(:parse_bool), :default => true},
-        FILTER_EF => {:parse => method(:parse_bool), :default => true},
-        FILTER_HB => {:parse => method(:parse_bool), :default => true},
-        FILTER_OTHER => {:parse => method(:parse_bool), :default => true}
-      }
-      @active_filters = validate_filters(@filter_defaults, filters)
-    end
-  end
-
-  class EstateFilter < RatsitFilter
-    include Ratsit
-    def initialize()
-      raise NotImplementedError, 'Functionality doesn\'t exist'
-    end
-  end
-
-  private
-
-  def parse_bool(arg)
-    return arg if arg.is_a?(TrueClass) || arg.is_a?(FalseClass)
-    raise RatsitFilterError, 'Invalid bool representation' if !arg.is_a?(String)
-    return true if arg.downcase == 'true'
-    return false if arg.downcase == 'false'
-    raise RatsitFilterError, 'Invalid textual bool value'
-  end
-
-  def parse_age(arg)
-    if arg.is_a?(String)
-      if !(arg =~ /^[0-9]+$/)
-        raise RatsitFilterError, 'Invalid age in filter'
-      end
-      larg = arg.to_i
-    elsif arg.is_a?(Integer)
-      larg = arg
-    else
-      raise RatsitFilterError, 'Invalid arg type in filter'
-    end
-    # ratsit specifies these ages.
-    if larg < 0 || larg > 150
-      raise RatsitFilterError, 'Invalid age'
-    end
-    return "#{larg}"
-  end
-
-  def validate_filters(filter_defaults={}, filters={})
-    if !filters.is_a?(Hash)
-      filters = {}
-    end
-    filters.reject! { |k,_| !filter_defaults.keys.include? k }
-    filter_defaults.each do |filter_name, defs|
-      if !filters.keys.include? filter_name
-        filters[filter_name] = defs[:default]
-      end
-      filters[filter_name] = defs[:parse].call(filters[filter_name])
-    end
-    if filters[FILTER_AGE_TO].to_i < filters[FILTER_AGE_FROM].to_i
-      raise RatsitFilterError, 'Invalid age span'
-    end
-    return filters
-  end
-
-end

data/lib/ratsit/package.rb

@@ -1,22 +0,0 @@
-
-module Ratsit
-  PACKAGE_SMALL_1 = 'small 1'
-  PACKAGE_SMALL_2 = 'small 2'
-  PACKAGE_SMALL_3 = 'small 3'
-  PACKAGE_REMARK  = 'anmarkning'
-  PACKAGE_MEDIUM  = 'medium'
-  PACKAGE_LARGE   = 'large'
-
-  def Ratsit.validate_package(package)
-    raise RatsitError, 'Invalid package argument type' if !package.is_a?(String)
-    return [
-        PACKAGE_SMALL_1,
-        PACKAGE_SMALL_2,
-        PACKAGE_SMALL_3,
-        PACKAGE_REMARK,
-        PACKAGE_MEDIUM,
-        PACKAGE_LARGE
-    ].include?(package)
-  end
-
-end

data/lib/ratsit/person.rb

@@ -1,39 +0,0 @@
-
-require 'ratsit/monkey'
-require 'ratsit/errors'
-
-module Ratsit
-
-  class Person
-
-    def initialize(json_obj)
-      if !json_obj.is_a?(Hash)
-        raise RatsitError, 'Invalid Person initializer'
-      end
-      @json_source = json_obj
-      json_obj.each do |k, v|
-        case k
-          when 'FirstName'
-            v.gsub!("<b>", "")
-            v.gsub!("</b>", "")
-          when 'Gender'
-            v = v.gsub("icon_", "")
-            v = v.gsub(".png", "")
-          when 'Married'
-            v = v.gsub("icon_", "")
-            v = v.gsub(".png", "")
-          when 'CompanyEngagement'
-            v = v.gsub("icon_", "")
-            v = v.gsub(".png", "")
-          else
-            v = v
-        end
-        self.class.send(:define_method, k.underscore) {
-          return v
-        }
-      end
-    end
-
-  end
-
-end

data/lib/ratsit/request.rb

@@ -1,80 +0,0 @@
-
-require 'faraday'
-require 'uri'
-require 'json'
-require 'ratsit/errors'
-require 'ratsit/filters'
-require 'ratsit/search_type'
-
-module Ratsit
-
-  class RatsitRequest
-
-    def initialize()
-
-    end
-
-    def exec()
-      uri = self.build_uri
-      conn = Faraday.new(:url => "http://#{uri.host}")
-      #puts "http://#{uri.host}"
-      #puts self.compose_request_body
-      @response = conn.post do |req|
-        req.url uri.request_uri
-        req.headers['Content-Type'] = 'application/json'
-        req.body = self.compose_request_body
-      end
-      #puts @response.body
-      #puts @response.status
-    end
-
-    def response_ok
-      return false if @response.nil?
-      return @response.status == 200
-    end
-
-    def response_body
-      return nil if @response.nil?
-      return @response.body
-    end
-  end
-
-  class RatsitOpenRequest < RatsitRequest
-
-    def initialize(search_term, search_area, search_type, filters)
-      super()
-      if search_type == Ratsit::SEARCH_TYPE_ESTATE
-        raise RatsitRequestError, 'Estate search is not available in open api'
-      end
-      @base_url = 'http://www.ratsit.se/BC/SearchSimple.aspx/'
-      @search_term = search_term
-      @search_area = search_area
-      @search_type = search_type
-      @search_filter = filters
-      self
-    end
-
-    def build_uri
-      if !Ratsit.validate_search_type(@search_type)
-        raise RatsitRequestError, 'Invalid search type'
-      end
-      URI.parse("#{@base_url}#{@search_type}")
-    end
-
-    def compose_request_body
-      {
-          'who': @search_term,
-          'where': @search_area,
-          'filter': @search_filter.to_json
-      }.to_json
-    end
-
-  end
-
-  class RatsitTokenRequest < RatsitRequest
-    def initialize()
-      raise NotImplementedError, 'Token requests are not supported yet'
-    end
-  end
-
-end

data/lib/ratsit/search_type.rb

@@ -1,19 +0,0 @@
-
-require 'ratsit/errors'
-
-module Ratsit
-
-  SEARCH_TYPE_PERSON  = 'PersonSearch'
-  SEARCH_TYPE_COMPANY = 'CompanySearch'
-  SEARCH_TYPE_ESTATE  = 'EstateSearch'
-
-  def Ratsit.validate_search_type(search_type)
-    raise RatsitError, 'Invalid search_type argument' if !search_type.is_a?(String)
-    return [
-        SEARCH_TYPE_PERSON,
-        SEARCH_TYPE_COMPANY,
-        SEARCH_TYPE_ESTATE
-    ].include?(search_type)
-  end
-
-end