koromo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 274989dcaa69f9b1c7d25faa5697bc9a645c43b1
-  data.tar.gz: f2f827427f6fd76bfb0fa7fd871ac8a3bef99b9f
+  metadata.gz: f67069b2b76b03b8f982a941aa72cc93782d7e74
+  data.tar.gz: 784ab1f693a52dd86e367d27245412f331a7aa31
 SHA512:
-  metadata.gz: 29d602aeb709c3564889119de0e6f2f850e62e4d8febfbdeaed197875d0f24867e15221e92464dac57f1b6cf208492384cd767933e61dd71cb9dc9e990e68586
-  data.tar.gz: 2d0bb77811fe6f7dd17a67b06e9ce55251586dd82a6b9807e472d2fadec56785bf9ba8c6aebafaa5eae56a9092c04d139c6f061433e5c384ebb4ae10c5f991f3
+  metadata.gz: 25bbc17eb577715fef17102cf6a4338688caa49e61668296f2e954fea0ac4cfec083fa72146dc855658902624eacc70abc12dba47efe87295ee5d7f41b0f5e2a
+  data.tar.gz: ec319f73cada0e208b14768eadda97c72295d519560c4b1b04b7a152ac94282920225fd9fae67bffac7e903bb113cd3f21a33b91193c42f8d7897515a8f7b2d0

data/lib/koromo/server.rb

@@ -24,7 +24,7 @@ module Koromo
       return @slogger
     end
 
-    helpers Helper, SQL
+    helpers Helper
 
     configure do
       set :environment, :production
@@ -35,11 +35,11 @@ module Koromo
     before do
       # @jsonp_callback = params[:callback]
       halt 401 unless valid_token?(params[:auth])
-      setup_sql(Koromo.config)
+      Koromo.sql.setup(Koromo.config)
     end
 
     get '/:resource' do |r|
-      result = get_resource(r, params: params)
+      result = Koromo.sql.get_resource(r, params: params)
       if result
         json_with_object(result)
       else
@@ -49,7 +49,7 @@ module Koromo
 
     get '/:resource/:id' do |r, id|
       fail Sinatra::NotFound if /\W/ =~ id
-      result = get_resource(r, id: id, params: params)
+      result = Koromo.sql.get_resource(r, id: id, params: params)
       if result
         json_with_object(result)
       else

data/lib/koromo/sql.rb

@@ -3,9 +3,17 @@ require 'sequel'
 
 module Koromo
 
-  module SQL
+  def self.sql
+    SQL.shared_instance
+  end
+
+  class SQL
+
+    def self.shared_instance
+      @sql ||= SQL.new
+    end
 
-    def setup_sql(conf)
+    def setup(conf)
       @config = conf
       # Sequel connection setup
       # Sequel.application_timezone = :local
@@ -37,20 +45,6 @@ module Koromo
       @models[name]
     end
 
-    def run_query(query)
-      result = mssql.execute(query)
-      records = []
-      result.each(cache_rows: false) do |row|
-        record = {}
-        row.each { |k, v| record[k] = convert_value(v) }
-        records.push record
-      end
-      records
-    # rescue => e
-    #   puts e.message
-    #   raise
-    end
-
     def get_resource(name, **args)
       return nil unless model = model_for_resource(name)
       p args[:params]

data/lib/koromo/version.rb

@@ -1,5 +1,5 @@
 module Koromo
 
-  Version = '0.0.1'
+  Version = '0.0.2'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koromo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ken J.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kajiki