lacuna 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af46cbe3601f8f84bc8c08ad470e15909b918c4b
-  data.tar.gz: 1b8ccfe2dd303a96235dbe014cf9d6822a047649
+  metadata.gz: cfcb24ca00be1e677b7416e35e97a471c8d9977b
+  data.tar.gz: 0dc4970c21acbdfa6de03a368d4756f96a93142c
 SHA512:
-  metadata.gz: eccfd26de7a5eb756957d74a13851303cd872264fe4f50a84ebaa9d1ccc1bd260a1c1ae2deef894d53ca64d6745e7c4b029482631a17c048380b64f649b6b37f
-  data.tar.gz: 3e1d1e3a2fcd71b174470234369f3b24ac91772b9f1083adf9156b90b3911616660b0a2965e9ab905d7f5ea0aa5f21738e5a2eb225841a4b879264e1feacd128
+  metadata.gz: b5aba662d10e3ffb5589193e55445c927901fd23504914df8a5578142a184e6a6af393c3fe06110ee5feb984ecc3fe7de36dd404ab316f2fcf5a354c7e983635
+  data.tar.gz: 74986f5ff81314826c9e94336d1d0e52098317bb9821b4455495f36a16c37e8449c3b0f1bf4981d8938dab4a680de3d0f3f09942ee11d3f701285bb2c6e53a10

data/lib/lacuna.rb

@@ -1,134 +1,57 @@
 # encoding: utf-8
 
 
+$LOAD_PATH.unshift File.dirname __FILE__
+
 require 'net/http'
 require 'openssl'
 require 'json'
+require 'require_all'
 
-class Session
-    @@session = nil
-
-    def self.set(val)
-        @@session = val
-    end
-
-    def self.end
-        self.set nil
-    end
-
-    def self.get
-        @@session
-    end
-
-    def self.valid?
-        # TODO: take into account the two hour session timeout.
-        !@@session.nil?
-    end
-end
-
-class Lacuna
-    VERSION = '0.0.2'
+require 'lacuna/version'
+require 'lacuna/session'
+require 'lacuna/constants'
+require 'lacuna/module'
 
-    API_KEYS = {
-        # Private key : 66090c68-2d51-47fa-b406-44dc98e6f6d3
-        'us1' => 'bbd9b648-6e45-419d-bdaf-5726919c4a64',
-        # Private key : 3a9c5121-0939-4ef9-82c2-7c1aa4f7d1bc
-        'pt'  => '3746d4a2-0f44-44db-9308-22a85c234aab',
-    }
+require_all File.join(File.dirname(__FILE__), 'lacuna', 'extras')
 
-    LACUNA_DOMAIN = 'lacunaexpanse.com'
+module Lacuna
 
-    def initialize(args)
+    def self.connect(args)
         # Allow a custom server url, be specifying the API key used there but
         # allow the name of the server (eg: 'us1') to be used, which selects
         # the API key corresponding to US1.
-        @api_key =
+        @@api_key =
             if args[:api_key]
                 args[:api_key]
             elsif args[:server_name] && !args[:server_url]
                 API_KEYS[args[:server_name]]
             end
 
-        @url =
+        @@url =
             if args[:server_url]
                 args[:server_url]
             elsif args[:server_name]
                 File.join('https://', args[:server_name] + '.' + LACUNA_DOMAIN)
             end
 
-        @args = args
+        @@args = args
 
         # TODO: allow a sleep-period for each request
     end
 
-    def method_missing(name, *args)
-        args = @args.merge :api_key => @api_key
-        LacunaModule.new(@url, name.id2name, args)
-    end
-end
-
-class LacunaModule
-
-    def initialize(base_url, module_name, args)
-        @base_url    = base_url
-        @url         = base_url
-        @module_name = module_name
-        @method_name = 'replace me!'
-        @args        = args
-    end
-
-    def send(url, post_module, post_method, data)
-        uri = URI.parse url
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-        request = Net::HTTP::Post.new '/' + post_module
-        request.add_field('Content-Type', 'application/json')
-
-        body = {
-            :id      => 1,
-            :jsonrpc => '2.0',
-            :method  => post_method,
-            :params  => data
-        }
-
-        # Include session id in requests that need it
-        if "#{post_module}/#{post_method}" != 'empire/login'
-            body[:params].unshift Session.get
-        end
-
-        request.body = JSON.generate body
-
-        response = http.request request
-        rv = JSON.parse response.read_body
-
-        # TODO: if !rv['error'].nil? throw an exception
-        if rv['result']
-            rv['result']
-        else
-            rv
-        end
-    end
+    @@url     = ''
+    @@args    = {}
+    @@api_key = ''
+    def self.url;     @@url;     end
+    def self.args;    @@args;    end
+    def self.api_key; @@api_key; end
 
-    # Check that we're logged in, if not, get session a set up.
-    def session_stuff
-        if !Session.valid?
-            res = self.send(@base_url, 'empire', 'login', [
-                @args[:name],
-                @args[:password],
-                @args[:api_key],
-            ])
-            Session.set res['session_id']
-        else
-            # check time
-            return
-        end
+    class Empire < Lacuna::Extras::Empire
+        @module_name = 'empire'
     end
 
-    def method_missing(name, *args)
-        @method_name = name.id2name
-        self.session_stuff
-        self.send(@url, @module_name, @method_name, args)
+    class Body < Lacuna::Extras::Body
+        @module_name = 'body'
     end
 end

data/lib/lacuna/constants.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module Lacuna
+    API_KEYS = {
+        # Private key : 66090c68-2d51-47fa-b406-44dc98e6f6d3
+        'us1' => 'bbd9b648-6e45-419d-bdaf-5726919c4a64',
+        # Private key : 3a9c5121-0939-4ef9-82c2-7c1aa4f7d1bc
+        'pt'  => '3746d4a2-0f44-44db-9308-22a85c234aab',
+    }
+
+    LACUNA_DOMAIN = 'lacunaexpanse.com'
+end

data/lib/lacuna/extras/body.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+module Lacuna
+    class Extras
+        class Body < Lacuna::Module
+
+        end
+    end
+end

data/lib/lacuna/extras/empire.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+module Lacuna
+    class Extras
+        class Empire < Lacuna::Module
+
+        end
+    end
+end

data/lib/lacuna/module.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+
+module Lacuna
+    class Module
+        def self.send(url, post_module, post_method, data)
+            uri = URI.parse url
+            http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+            request = Net::HTTP::Post.new '/' + post_module
+            request.add_field('Content-Type', 'application/json')
+
+            body = {
+                :id      => 1,
+                :jsonrpc => '2.0',
+                :method  => post_method,
+                :params  => data
+            }
+
+            # Include session id in requests that need it
+            if "#{post_module}/#{post_method}" != 'empire/login'
+                body[:params].unshift Session.get
+            end
+
+            request.body = JSON.generate body
+
+            response = http.request request
+            rv = JSON.parse response.read_body
+
+            if rv['result']
+                rv['result']
+            elsif rv['error']
+                # TODO: throw error?
+                p rv['error']
+                rv['error']
+            else
+                rv
+            end
+        end
+
+        # Check that we're logged in, if not, get session a set up.
+        def self.session_stuff
+            if !Session.valid?
+                res = self.send(Lacuna.url, 'empire', 'login', [
+                    Lacuna.args[:name],
+                    Lacuna.args[:password],
+                    Lacuna.api_key,
+                ])
+                Session.set res['session_id']
+            else
+                # check time
+                return
+            end
+        end
+
+        def self.method_missing(name, *args)
+            if !@module_name.nil?
+                self.session_stuff
+                self.send(Lacuna.url, @module_name, name.id2name, args)
+            else
+                puts "#{self} isn't working!"
+            end
+        end
+    end
+end

data/lib/lacuna/session.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+class Session
+    @@session = nil
+
+    def self.set(val)
+        @@session = val
+    end
+
+    def self.end
+        self.set nil
+    end
+
+    def self.get
+        @@session
+    end
+
+    def self.valid?
+        # TODO: take into account the two hour session timeout.
+        !@@session.nil?
+    end
+end

data/lib/lacuna/version.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+module Lacuna
+    VERSION = '0.0.3'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lacuna
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nathan McCallum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-05-30 00:00:00.000000000 Z
+date: 2010-06-02 00:00:00.000000000 Z
 dependencies: []
 description: Lacuna is a Ruby library for using the API of The Lacuna Expanse.
 email: nmccallum7@gmail.com
@@ -17,6 +17,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/lacuna.rb
+- lib/lacuna/constants.rb
+- lib/lacuna/extras/body.rb
+- lib/lacuna/extras/empire.rb
+- lib/lacuna/module.rb
+- lib/lacuna/session.rb
+- lib/lacuna/version.rb
 homepage: http://rubygems.org/gems/lacuna
 licenses:
 - MIT