numerics 0.2.4 → 0.3.2

data/lib/numerics.rb

@@ -5,72 +5,72 @@ end
 require 'yajl'
 
 require 'numerics/connection'
+require 'numerics/configuration'
 
 module Numerics
 
-  VERSION = '0.2.4'
+  VERSION = '0.3.2'
   
-  def self.connect(arg, env=nil)
-    config = if arg.is_a?(Hash)
-               arg
-             else
-               if arg.match(/\.json$/)
-                 File.open(arg){ |f| Yajl::Parser.parse(f) }
-               elsif arg.match(/\.ya?ml$/)
-                 YAML::load_file(arg)
-               else
-                 nil
-               end
-             end
+  def self.connect(arg, env=nil, key_set=nil)
+    configuration = if arg.is_a?(Numerics::Configuration)
+                      if key_set.nil?
+                        key_set = env
+                      else
+                        raise ArgumentError, 'no env required if you pass in a Configuration object'
+                      end
+                      arg
+                    else
+                      Numerics::Configuration.new(arg, env)
+                    end
 
-    if !config
-      raise "Only json and yaml config files supported"
-    end
-    
-    if env
-      config = config[env.to_s] || config[env.to_sym]
-      if !config
-        raise "No #{env} found in #{arg}"
-      end
-    end
+    keys = if key_set.nil?
+             configuration.main
+           else
+             configuration.send(key_set)
+           end
 
-    access_key = config[:access_key] || config['access_key']
-    secret_key = config[:secret_key] || config['secret_key']
-    host = config[:host] || config['host'] # nil means use the default
-    port = config[:port] || config['port'] # nil means use the default
-    disabled = config[:disabled] || config['disabled']
-
-    if !access_key && !secret_key
-      raise ArgumentError, 'Numerics.connect(config_file, env=nil) or Numerics.connect(:access_key => access_key, :secret_key => :secret_key)'
+    if !keys.access_key && !keys.secret_key
+      raise ArgumentError, 'Numerics.connect(config_file, env=nil, key_set=nil) or Numerics.connect(:access_key => access_key, :secret_key => :secret_key)'
     end
 
-    Numerics::Connection.new(access_key, secret_key, host, port, disabled)
+    Numerics::Connection.new(keys.access_key, keys.secret_key, configuration.host, configuration.port, configuration.disabled?)
   end
 
-  def self.config(arg, env=nil)
-    @global_connection = self.connect(arg, env)
+  def self.configure(arg, env=nil, key_set=nil)
+    @global_configuration = Numerics::Configuration.new(arg, env)
+    @global_connection = self.connect(@global_configuration, key_set)
   end
 
-  def self.global_connection
+  def self.connection
     @global_connection
   end
 
-  def self.global_connection=(gc)
-    @global_connection = gc
+  def self.configuration
+    @global_configuration
   end
 
   def self.respond_to?(method)
     !@global_connection.nil? && @global_connection.respond_to?(method)
   end
 
-  ##@@ check syntax
   def self.method_missing(method, *args, &block)
     if self.respond_to?(method)
       @global_connection.send(method, *args, &block)
     else
       super
     end
+  end
 
+  JAVASCRIPT_URL = 'https://numerics.io/assets/numerics.js'
+  #CDN_JAVASCRIPT_URL = 'https://lib.numerics.io/assets/numerics.js'
+  CDN_JAVASCRIPT_URL = 'https://d19a9qlbf2kkmc.cloudfront.net/assets/numerics.js'
+
+  def self.javascript_url(cdn=true)
+    if cdn
+      self::CDN_JAVASCRIPT_URL
+    else
+      self::JAVASCRIPT_URL
+    end
   end
 
 end

data/lib/numerics/configuration.rb

@@ -0,0 +1,81 @@
+require 'yajl'
+
+module Numerics
+
+  class KeySet
+
+    attr_accessor :access_key, :secret_key
+
+    def initialize(keys)
+      @access_key = keys[:access_key] || keys['access_key'] || keys[:key] || keys['key']
+      @secret_key =  keys[:secret_key] || keys['secret_key'] || keys[:secret] || keys['secret']
+    end
+    
+    def to_hash
+      {:access_key => @access_key, :secret_key => @secret_key}
+    end
+
+    def to_json
+      Yajl::Encoder.encode(self.to_hash)
+    end
+
+  end
+
+  class Configuration
+
+    def initialize(arg, env=nil)
+      @config = if arg.is_a?(Hash)
+                 arg
+               else
+                 if arg.match(/\.json$/)
+                   File.open(arg){ |f| Yajl::Parser.parse(f) }
+                 elsif arg.match(/\.ya?ml$/)
+                   YAML::load_file(arg)
+                 else
+                   nil
+                 end
+               end
+      
+      if !@config
+        raise "Only json and yaml config files supported"
+      end
+      
+      if env
+        @config = @config[env.to_s] || @config[env.to_sym]
+        if !@config
+          raise "No #{env} found in #{arg}"
+        end
+      end      
+    end
+
+    def main
+      KeySet.new(@config['main'] || @config[:main] || @config)
+    end
+
+    def disabled?
+      @config[:disabled] || @config['disabled']
+    end
+
+    def host
+      @config[:host] || @config['host']
+    end
+
+    def port
+      @config[:port] || @config['port']
+    end
+
+    def respond_to?(meth)
+      @config.has_key?(meth.to_s) || @config.has_key?(meth.to_sym) || super
+    end
+
+    def method_missing(meth)
+      keys = @config[meth.to_s] || @config[meth.to_sym]
+      if keys
+        KeySet.new(keys)
+      else
+        super
+      end
+    end
+
+  end
+end

data/lib/numerics/connection.rb

@@ -5,6 +5,8 @@ if RUBY_VERSION =~ /^1\.8/
 end
 require 'yajl'
 
+require 'numerics/configuration'
+
 module Numerics
   class Connection
 

metadata

@@ -2,7 +2,7 @@
 name: numerics
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ben Lund
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-19 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
@@ -34,6 +34,7 @@ extra_rdoc_files: []
 files: 
 - lib/numerics.rb
 - lib/numerics/connection.rb
+- lib/numerics/configuration.rb
 homepage: http://github.com/frequalize/numerics-ruby
 licenses: []