uzuuzu-core 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/uzuuzu/application.rb

@@ -18,8 +18,6 @@ module UzuUzu
     #
     attr_accessor :after_filters
     #
-    attr_accessor :dicons
-    #
     attr_accessor :helpers
     #
     attr_accessor :views
@@ -73,24 +71,9 @@ module UzuUzu
     def after_filters
       @after_filters ||= self.class.after_filters.clone
     end
-    
-    def self.dicons
-      @@dicons ||= [
-                    Helper::UzuUzuHelper,
-                    Helper::Controller,
-                    Helper::Renderer, 
-                    Helper::Localize,
-                    Helper::Route,
-                  ]
-    end
-
-    def dicons
-      @dicons ||= self.class.dicons.clone
-    end
 
     def self.helpers
       @@helpers ||= [
-                     Helper::UzuUzuHelper,
                      Helper::Controller,
                      Helper::Form,
                      Helper::Jquery,
@@ -122,7 +105,8 @@ module UzuUzu
       response = UzuUzu::Response.new
       clazz = find_controller(env)
       if clazz.blank?
-        return not_found(request, response)
+        di_thread(request, response, nil, nil,  nil, nil, nil)
+        return not_found(response)
       end
 
       is_send = false
@@ -133,23 +117,22 @@ module UzuUzu
         query = map[:query]
         route = map[:route]
         controller = controller_class.new
-        include_dicon(controller)
         helper = Helper::Helper.new
         include_helper(helper)
 
         action, query = find_action(controller, query)
+        di_thread(request, response, controller, helper,  action, query, route)
         next if action.blank?
         is_send = true
-        di_thread(request, response, controller, helper,  action, query, route)
         action_return = send_action(request, response, controller, action, query)
         if response.body.blank?
-          render = controller.render(action)
+          render = helper.render(action)
         end
         break
       end
       
       unless is_send
-        return not_found(request, response)
+        return not_found(response)
       end
       if response.status == 200 and response.body.blank?
         response.write render || action_return
@@ -216,18 +199,15 @@ module UzuUzu
     #
     #
     #
-    def include_dicon(controller)
-      dicons.each do |dicon|
-        controller.extend(dicon)
-      end
-    end # include_dicon
-    
     def include_helper(helper)
       helpers.each do |h|
         helper.extend(h)
       end
     end # include_helper
     
+    #
+    #
+    #
     def di_thread(request, response, controller, helper, action, query, route)
       current = ::Thread.current
       current[:request] = request
@@ -266,22 +246,22 @@ module UzuUzu
             end
           end
         end
-        unless (arity >= 0 && query.size == arity) or
+        unless (arity >= 0 && query.size == arity) ||
                (arity < 0 && query.size >= ((-1 * arity)-1))
           index_flag = true
         end
         if index_flag && !(action == 'index') && controller.respond_to?(:index)
           query.unshift(action)
           action = 'index'
-          if controller.respond_to?(action)
-            arity = controller.method(action).arity
-            unless (arity >= 0 && query.size == arity) ||
-                   (arity < 0 && query.size >= ((-1 * arity)-1))
-              action = nil
-            end
-          else
+        end
+        if controller.respond_to?(action)
+          arity = controller.method(action).arity
+          unless (arity >= 0 && query.size == arity) ||
+                 (arity < 0 && query.size >= ((-1 * arity)-1))
             action = nil
           end
+        else
+          action = nil
         end
       end
       [action, query]
@@ -313,21 +293,12 @@ module UzuUzu
       end
       value
     end # send_action
-    
-    def error(code, request, response)
-      ::UzuUzu.logger.debug "error : #{code}"
-      uri = "#{request.scheme}://#{request.host}"
-      if (request.scheme == 'https' and request.port != 443) or
-          (request.scheme == 'http' and request.port != 80)
-        uri << ":#{request.port}"
+
+    def not_found(response)
+      catch(:finish) do
+        response.redirect("/error/404")
       end
-      uri << "#{request.env["SCRIPT_NAME"]}/error/#{code}"
-      response.redirect(uri)
       response.finish
     end
-
-    def not_found(request, response)
-      error(404, request, response)
-    end
   end # Application
 end # UzuUzu

data/lib/uzuuzu/controller.rb

@@ -3,6 +3,7 @@
 module UzuUzu
   module Controller
     autoload(:Error, 'uzuuzu/controller/error')
+    
     def self.current
       Thread.current[:controller]
     end

data/lib/uzuuzu/controller/error.rb

@@ -4,7 +4,7 @@ module UzuUzu
   module Controller
     class Error
       def index(code)
-        respond(render_file(__DIR__("view/error/#{code}.rhtml")))
+        response.respond(helper.render_file(__DIR__("view/error/#{code}.rhtml")))
       end
     end
   end

data/lib/uzuuzu/datastore/datamapper.rb

@@ -110,7 +110,113 @@ module UzuUzu
         end
         false
       end
+
+      def import_file(model, file, overwrite=false)
+        unless ::File.file?(file)
+          raise "UzuUzu fixture import error file not found : #{file}"
+        end
+        ext = ::File.extname(file)
+        case(ext)
+        when '.yml', '.yaml'
+          import_yaml(model, ::YAML.load_file(file), overwrite)
+        when '.xml'
+          # TODO
+        when '.json', '.js'
+          # TODO
+        when '.csv'
+          begin
+            require 'fastercsv'
+            ::FasterCSV.foreach(file) do |row|
+              import_csv(model, row, overwrite)
+            end
+          rescue
+            require "csv"
+            ::CSV.open(file) do |row|
+              import_csv(model, row, overwrite)
+            end
+          end
+        end
+        nil
+      end
+      
+      def import_yaml(model, yaml, overwrite=false)
+        ::UzuUzu.logger.debug 'import yaml'
+        transaction do |tr|
+          tr.begin
+          begin
+            if yaml.kind_of?(Array)
+              yaml.each do |map|
+                ::UzuUzu.logger.debug "import #{map.inspect}"
+                resource = model.first(:id => map[:id]) unless map[:id].nil?
+                if resource.nil?
+                  resource = model.new(map)
+                  unless resource.valid?
+                    ::UzuUzu.logger.error resource.errors
+                  end
+                  resource.save
+                elsif overwrite
+                  resource.update(map)
+                  unless resource.valid?
+                    ::UzuUzu.logger.error resource.errors
+                  end
+                end
+              end
+            elsif yaml.kind_of?(Hash)
+              ::UzuUzu.logger.debug "import #{yaml.inspect}"
+              resource = model.first(:id => yaml[:id]) unless yaml[:id].nil?
+              if resource.nil?
+                resource = model.new(yaml)
+                unless resource.valid?
+                  ::UzuUzu.logger.error resource.errors
+                end
+                resource.save
+              elsif overwrite
+                resource.update(yaml)
+                unless resource.valid?
+                  ::UzuUzu.logger.error resource.errors
+                end
+              end
+            else
+              ::UzuUzu.logger.error "import type miss match #{yaml.inspect}"
+            end
+            ::UzuUzu.logger.debug 'imported yaml'
+            tr.commit
+          rescue => e
+            tr.rollback
+            raise e
+          end
+        end # transaction
+      end # import_yaml
+      
+      def import_json(model, json, overwrite=false)
+        # TODO
+      end
+      
+      def import_xml(model, xml, overwrite=false)
+        # TODO
+      end
       
+      def import_csv(model, csv, overwrite=false)
+        transaction do |tr|
+          tr.begin
+          begin
+            resource = model.first(:id => csv[0])
+            csv.each_with_index do |culumn, index|
+              if resource.nil? || overwrite
+                resource ||= model.new
+                resource.properties.each_with_index do |property, column_no|
+                  resource[property.name] = culumn if index = column_no
+                end
+                resource.save
+              end
+            end
+            tr.commit
+          rescue => e
+            tr.rollback
+            raise e
+          end
+        end
+      end # import_csv
     end # Datamapper
   end # DataStore
 end # UzuUzu

data/lib/uzuuzu/helper.rb

@@ -8,7 +8,6 @@ module UzuUzu
     autoload(:Localize, 'uzuuzu/helper/localize')
     autoload(:Renderer, 'uzuuzu/helper/renderer')
     autoload(:Route, 'uzuuzu/helper/route')
-    autoload(:UzuUzuHelper, 'uzuuzu/helper/uzuuzu')
     autoload(:XHtml, 'uzuuzu/helper/xhtml')
     
     def self.current

data/lib/uzuuzu/helper/controller.rb

@@ -9,6 +9,41 @@ module UzuUzu
     #
     #
     module Controller
+      #
+      #
+      #
+      def logger
+        ::UzuUzu.logger
+      end
+  
+      #
+      #
+      #
+      def memcache
+        ::UzuUzu.memcache
+      end
+      
+      #
+      #
+      #
+      def kvs
+        ::UzuUzu.kvs
+      end
+      
+      #
+      #
+      #
+      def datastore
+        ::UzuUzu.datastore
+      end
+      
+      #
+      #
+      #
+      def mailer
+        ::UzuUzu.mailer
+      end
+      
       #
       #
       #
@@ -20,28 +55,42 @@ module UzuUzu
       #
       #
       def controller
-        ::UzuUzu::Controller.current
+        ::UzuUzu.controller
       end
       
       #
       #
       #
       def request
-        ::UzuUzu::Request.current
+        ::UzuUzu.request
       end
   
       #
       #
       #
       def response
-        ::UzuUzu::Response.current
+        ::UzuUzu.response
       end
       
       #
       #
       #
       def helper
-        ::UzuUzu::Helper.current
+        ::UzuUzu.helper
+      end
+      
+      #
+      #
+      #
+      def model
+        ::UzuUzu.model
+      end
+      
+      #
+      #
+      #
+      def service
+        ::UzuUzu.service
       end
       
       #
@@ -86,16 +135,6 @@ module UzuUzu
         Rack::Utils.unescape(s)
       end
       
-      #
-      #
-      #
-      def mime_type(type, value=nil)
-        return type if type.nil? || type.to_s.include?('/')
-        type = ".#{type}" unless type.to_s[0] == ?.
-        return Rack::Mime.mime_type(type, nil) if value.nil?
-        Rack::Mime::MIME_TYPES[type] = value
-      end
-      
       #
       #
       #

data/lib/uzuuzu/helper/renderer.rb

@@ -16,32 +16,12 @@ module UzuUzu
           _query = query
           _route = route
           browser = ::Rack::MockRequest.new(::UzuUzu.current)
-          _render_response = browser.get(controller.rf(controller_clazz, action, options))
+          _render_response = browser.get(helper.rf(controller_clazz, action, options))
           _render =  _render_response.body.to_s
           ::UzuUzu.current.di_thread(_request, _response, _controller, _helper, _action, _query, _route)
           _render
       end
       
-      #
-      #
-      #
-      def respond(string, mime=nil, status=200)
-        response.status = 200
-        response["Content-Type"] = mime_type(mime) || mime unless mime.nil?
-        response.write string
-        throw :finish
-      end
-      
-      #
-      #
-      #
-      def respond_to
-        return unless block_given?
-        response.status = 200
-        contents = yield(request.wish)
-        respond(contents, request.wish) if contents and response.successful?
-      end
-      
       #
       #
       #
@@ -50,7 +30,7 @@ module UzuUzu
         catch(:view_finded) do
           ::Tilt.mappings.each_key do |key|
             application.views.each do |view_route|
-              _view_path = "#{view_route}#{controller.route}/#{view}.#{key}"
+              _view_path = "#{view_route}#{helper.route}/#{view}.#{key}"
               if ::File.file?(_view_path)
                 view_path = _view_path
                 throw :view_finded
@@ -85,83 +65,6 @@ module UzuUzu
         UzuUzu.render_engine(helper, view_string, engine, options, locals, &block)
       end
       
-      def send_file()
-        
-      end
-      
-      def send_binary()
-        
-      end
-      
-      #
-      #
-      #
-      def redirect(uri, options={})
-        if not uri =~ /^https?:\/\//
-          abs_uri = "#{request.scheme}://#{request.host}"
-
-          if request.scheme == 'https' && request.port != 443 ||
-          request.scheme == 'http' && request.port != 80
-            abs_uri << ":#{request.port}"
-          end
-          uri = (abs_uri << uri)
-        end
-        uri << query_string(options)
-        response.redirect(uri)
-        throw :finish
-      end # redirect
-
-      #
-      #
-      #
-      def server_error(code=500, options={})
-        redirect controller.rf(UzuUzu::Controller::Index, :error, code)
-      end # error
-      
-      #
-      #
-      #
-      def not_found(code=404, options={})
-        redirect controller.rf(UzuUzu::Controller::Index, :error, code)
-      end
-      
-      #
-      #
-      #
-      def last_modified(time)
-        return unless time
-        if time.respond_to?(:to_time)
-            time = time.to_time
-        else
-            time = ::Time.parse(time.to_s)
-        end
-        response['Last-Modified'] = time.httpdate
-        if ::Time.httpdate(request.env['HTTP_IF_MODIFIED_SINCE']).to_i >= time.to_i
-          response.status = 304
-          throw :finish
-        end
-      end # last_modified
-      
-      #
-      #
-      #
-      def etag(value, kind=:strong)
-        raise ::TypeError, ":strong or :weak expected" if ![:strong,:weak].include?(kind)
-        value = '"%s"' % value
-        value = 'W/' + value if kind == :weak
-        response['ETag'] = value
-  
-        # Conditional GET check
-        if etags = env['HTTP_IF_NONE_MATCH']
-          etags = etags.split(/\s*,\s*/)
-          if etags.include?(value) || etags.include?('*')
-            response.status = 304
-            throw :finish
-          end
-        end
-      end # etag
-      
-      
     end # Renderer
   end # Helper
 end # UzuUzu

data/lib/uzuuzu/lang/en.yaml

@@ -11,13 +11,4 @@ login: Login
 not_found: page is not found
 server_error: server error
 
-# openid
-openid_messege: Choice!
-openid_url: Other OpenId URL
-
-# user entry
-user_entry: Please Entry
-user_entry_name: Display Name
-
-
 

data/lib/uzuuzu/lang/ja.yaml

@@ -6,6 +6,7 @@ entry: 登録
 update: 更新
 delete: 削除
 
+login: ログイン
 
 # error
 not_found: お探しのページが見つかりません。

data/lib/uzuuzu/model.rb

@@ -0,0 +1,49 @@
+# coding: utf-8
+
+module UzuUzu
+  module Model
+    #
+    AppsLoaded = {}
+    #
+    #
+    #
+    def const_missing(id)
+      AppsLoaded[::UzuUzu.current.name] ||= {}
+      model = AppsLoaded[::UzuUzu.current.name][id.to_sym]
+      unless model
+        require_base = self.name.gsub(/::/, '/').sub(/^UzuUzu/, 'uzuuzu').snake_case
+        require "#{require_base}/#{::UzuUzu.datastore.adapter}/#{id.to_s.snake_case}"
+        model = const_get("#{::UzuUzu.datastore.adapter.to_s.camel_case}").const_get("#{id}")
+        model.apploaded if model.respond_to?(:apploaded)
+        AppsLoaded[::UzuUzu.current.name][id.to_sym] = model
+      end
+      if model
+        model
+      else
+        super(id)
+      end
+    rescue => e
+      ::UzuUzu.logger.debug e
+      ::UzuUzu.logger.debug e.backtrace
+      super(id)
+    end
+    
+    #
+    #
+    #
+    def method_missing(id)
+      model = self.const_missing(id.to_s.camel_case)
+      if model
+        model
+      else
+        super(id)
+      end
+    rescue => e
+      ::UzuUzu.logger.debug e
+      ::UzuUzu.logger.debug e.backtrace
+      super(id)
+    end
+    
+    extend self
+  end # Model
+end # UzuUzu

data/lib/uzuuzu/response.rb

@@ -5,11 +5,127 @@ module UzuUzu
   #
   #
   class Response < Rack::Response
+    include ::UzuUzu::Helper::Controller
+    
     #
     #
     #
     def self.current
       Thread.current[:response]
     end
+    
+    #
+    #
+    #
+    def rack_mime_type(type, value=nil)
+      return type if type.nil? || type.to_s.include?('/')
+      type = ".#{type}" unless type.to_s[0] == ?.
+      return Rack::Mime.mime_type(type, nil) if value.nil?
+      Rack::Mime::MIME_TYPES[type] = value
+    end
+    
+    #
+    #
+    #
+    def mime_type(mime)
+      @header["Content-Type"] = rack_mime_type(mime) || mime if mime
+    end
+    
+    #
+    #
+    #
+    def respond(string, mime=nil, status=200)
+      @status = 200
+      mime_type(mime)
+      write string
+      throw :finish
+    end
+    
+    #
+    #
+    #
+    def respond_to
+      return unless block_given?
+      @status = 200
+      contents = yield(request.wish)
+      respond(contents, request.wish) if contents and successful?
+    end
+      
+    def send_file()
+      
+    end
+    
+    def send_binary()
+      
+    end
+    
+    #
+    #
+    #
+    def server_error(code=500, options={})
+      redirect "/error/#{code}"
+    end # error
+    
+    #
+    #
+    #
+    def not_found(code=404, options={})
+      server_error(code, options)
+    end
+    
+    #
+    #
+    #
+    def redirect(uri, options={})
+      if not uri =~ /^https?:\/\//
+        abs_uri = "#{request.scheme}://#{request.host}"
+
+        if request.scheme == 'https' && request.port != 443 ||
+        request.scheme == 'http' && request.port != 80
+          abs_uri << ":#{request.port}"
+        end
+        uri = (abs_uri << uri)
+      end
+      uri << query_string(options)
+      super(uri)
+      throw :finish
+    end # redirect
+    
+    #
+    #
+    #
+    def last_modified(time)
+      return unless time
+      if time.respond_to?(:to_time)
+          time = time.to_time
+      else
+          time = ::Time.parse(time.to_s)
+      end
+      @header['Last-Modified'] = time.httpdate
+      if ::Time.httpdate(request.env['HTTP_IF_MODIFIED_SINCE']).to_i >= time.to_i
+        @status = 304
+        throw :finish
+      end
+    end # last_modified
+    
+    #
+    #
+    #
+    def etag(value, kind=:strong)
+      raise ::TypeError, ":strong or :weak expected" if ![:strong,:weak].include?(kind)
+      value = '"%s"' % value
+      value = 'W/' + value if kind == :weak
+      @header['ETag'] = value
+
+      # Conditional GET check
+      if etags = request.env['HTTP_IF_NONE_MATCH']
+        etags = etags.split(/\s*,\s*/)
+        if etags.include?(value) || etags.include?('*')
+          @status = 304
+          throw :finish
+        end
+      end
+    end # etag
+    
   end
 end

data/lib/uzuuzu/service.rb

@@ -0,0 +1,48 @@
+# coding: utf-8
+
+module UzuUzu
+  module Service
+    AppsLoaded = {}
+    #
+    #
+    #
+    def const_missing(id)
+      AppsLoaded[::UzuUzu.current.name] ||= {}
+      service = AppsLoaded[::UzuUzu.current.name][id.to_sym]
+      unless service
+        require_base = self.name.gsub(/::/, '/').sub(/^UzuUzu/, 'uzuuzu').snake_case
+        require "#{require_base}/#{::UzuUzu.datastore.adapter}/#{id.to_s.snake_case}"
+        service = const_get("#{::UzuUzu.datastore.adapter.to_s.camel_case}").const_get("#{id}")
+        service.apploaded if service.respond_to?(:apsploaded)
+        AppsLoaded[::UzuUzu.current.name][id.to_sym] = service
+      end
+      if service
+        service
+      else
+        super(id)
+      end
+    rescue => e
+      ::UzuUzu.logger.debug e
+      ::UzuUzu.logger.debug e.backtrace
+      super(id)
+    end
+    
+    #
+    #
+    #
+    def method_missing(id)
+      service = const_missing(id.to_s.camel_case)
+      if service
+        service.new
+      else
+        super(id)
+      end
+    rescue => e
+      ::UzuUzu.logger.debug e
+      ::UzuUzu.logger.debug e.backtrace
+      super(id)
+    end
+    
+    extend self
+  end # Service
+end # UzuUzu

data/lib/uzuuzu/wrapper/uzuuzu.rb

@@ -62,6 +62,30 @@ module UzuUzu
     Environments.current.localize
   end
   
+  def controller
+    Controller.current
+  end
+
+  def helper
+    Helper.current
+  end
+  
+  def request
+    Request.current
+  end
+  
+  def response
+    Response.current
+  end
+  
+  def model
+    Model
+  end
+  
+  def service
+    Service
+  end
+  
   #
   def render_engine(instance, view_string, engine='erb', options={}, locals={}, &block)
     Tilt.render_engine(instance, view_string, engine, options, locals, &block)

data/lib/uzuuzu_core.rb

@@ -12,8 +12,10 @@ require 'uzuuzu/wrapper/logger'
 require 'uzuuzu/wrapper/wrapper'
 require 'uzuuzu/application'
 require 'uzuuzu/environments'
+require 'uzuuzu/helper'
 require 'uzuuzu/request'
 require 'uzuuzu/response'
-require 'uzuuzu/helper'
 require 'uzuuzu/controller'
+require 'uzuuzu/service'
+require 'uzuuzu/model'
 require 'uzuuzu/tilt'

data/uzuuzu-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-core}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2011-09-21}
+  s.date = %q{2011-09-24}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya.v3v@gmail.com}
   s.extra_rdoc_files = [
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
     "lib/uzuuzu/datastore/sequel.rb",
     "lib/uzuuzu/environments.rb",
     "lib/uzuuzu/ext/object.rb",
-    "lib/uzuuzu/fixture/datamapper.rb",
     "lib/uzuuzu/helper.rb",
     "lib/uzuuzu/helper/controller.rb",
     "lib/uzuuzu/helper/form.rb",
@@ -44,7 +43,6 @@ Gem::Specification.new do |s|
     "lib/uzuuzu/helper/localize.rb",
     "lib/uzuuzu/helper/renderer.rb",
     "lib/uzuuzu/helper/route.rb",
-    "lib/uzuuzu/helper/uzuuzu.rb",
     "lib/uzuuzu/helper/xhtml.rb",
     "lib/uzuuzu/kvs/appengine.rb",
     "lib/uzuuzu/kvs/hbase.rb",
@@ -63,12 +61,14 @@ Gem::Specification.new do |s|
     "lib/uzuuzu/memcache/dalli.rb",
     "lib/uzuuzu/memcache/leveldb.rb",
     "lib/uzuuzu/memcache/memcached.rb",
+    "lib/uzuuzu/model.rb",
     "lib/uzuuzu/rack_session/appengine.rb",
     "lib/uzuuzu/rack_session/cookie.rb",
     "lib/uzuuzu/rack_session/datastore.rb",
     "lib/uzuuzu/rack_session/memcache.rb",
     "lib/uzuuzu/request.rb",
     "lib/uzuuzu/response.rb",
+    "lib/uzuuzu/service.rb",
     "lib/uzuuzu/tilt.rb",
     "lib/uzuuzu/wrapper/logger.rb",
     "lib/uzuuzu/wrapper/uzuuzu.rb",

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 +09:00
+date: 2011-09-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,7 +141,6 @@ files:
 - lib/uzuuzu/datastore/sequel.rb
 - lib/uzuuzu/environments.rb
 - lib/uzuuzu/ext/object.rb
-- lib/uzuuzu/fixture/datamapper.rb
 - lib/uzuuzu/helper.rb
 - lib/uzuuzu/helper/controller.rb
 - lib/uzuuzu/helper/form.rb
@@ -149,7 +148,6 @@ files:
 - lib/uzuuzu/helper/localize.rb
 - lib/uzuuzu/helper/renderer.rb
 - lib/uzuuzu/helper/route.rb
-- lib/uzuuzu/helper/uzuuzu.rb
 - lib/uzuuzu/helper/xhtml.rb
 - lib/uzuuzu/kvs/appengine.rb
 - lib/uzuuzu/kvs/hbase.rb
@@ -168,12 +166,14 @@ files:
 - lib/uzuuzu/memcache/dalli.rb
 - lib/uzuuzu/memcache/leveldb.rb
 - lib/uzuuzu/memcache/memcached.rb
+- lib/uzuuzu/model.rb
 - lib/uzuuzu/rack_session/appengine.rb
 - lib/uzuuzu/rack_session/cookie.rb
 - lib/uzuuzu/rack_session/datastore.rb
 - lib/uzuuzu/rack_session/memcache.rb
 - lib/uzuuzu/request.rb
 - lib/uzuuzu/response.rb
+- lib/uzuuzu/service.rb
 - lib/uzuuzu/tilt.rb
 - lib/uzuuzu/wrapper/logger.rb
 - lib/uzuuzu/wrapper/uzuuzu.rb
@@ -196,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3127904207285325660
+      hash: 3259301030999928627
       segments: 
       - 0
       version: "0"

data/lib/uzuuzu/fixture/datamapper.rb

@@ -1,114 +0,0 @@
-# coding: utf-8
-
-module UzuUzu
-  module DataStore
-    module Fixture
-      def self.import_file(model, file, overwrite=false)
-        unless ::File.file?(file)
-          raise "UzuUzu fixture import error file not found : #{file}"
-        end
-        ext = ::File.extname(file)
-        case(ext)
-        when '.yml', '.yaml'
-          import_yaml(model, ::YAML.load_file(file), overwrite)
-        when '.xml'
-          # TODO
-        when '.json', '.js'
-          # TODO
-        when '.csv'
-          begin
-            require 'fastercsv'
-            ::FasterCSV.foreach(file) do |row|
-              import_csv(model, row, overwrite)
-            end
-          rescue
-            require "csv"
-            ::CSV.open(file) do |row|
-              import_csv(model, row, overwrite)
-            end
-          end
-        end
-        nil
-      end
-      
-      def self.import_yaml(model, yaml, overwrite=false)
-        ::UzuUzu.logger.debug 'import yaml'
-        ::UzuUzu.transaction do |tr|
-          tr.begin
-          begin
-            if yaml.kind_of?(Array)
-              yaml.each do |map|
-                ::UzuUzu.logger.debug "import #{map.inspect}"
-                resource = model.first(:id => map[:id]) unless map[:id].nil?
-                if resource.nil?
-                  resource = model.new(map)
-                  unless resource.valid?
-                    ::UzuUzu.logger.error resource.errors
-                  end
-                  resource.save
-                elsif overwrite
-                  resource.update(map)
-                  unless resource.valid?
-                    ::UzuUzu.logger.error resource.errors
-                  end
-                end
-              end
-            elsif yaml.kind_of?(Hash)
-              ::UzuUzu.logger.debug "import #{yaml.inspect}"
-              resource = model.first(:id => yaml[:id]) unless yaml[:id].nil?
-              if resource.nil?
-                resource = model.new(yaml)
-                unless resource.valid?
-                  ::UzuUzu.logger.error resource.errors
-                end
-                resource.save
-              elsif overwrite
-                resource.update(yaml)
-                unless resource.valid?
-                  ::UzuUzu.logger.error resource.errors
-                end
-              end
-            else
-              ::UzuUzu.logger.error "import type miss match #{yaml.inspect}"
-            end
-            ::UzuUzu.logger.debug 'imported yaml'
-            tr.commit
-          rescue => e
-            tr.rollback
-            raise e
-          end
-        end # transaction
-      end # import_yaml
-      
-      def self.import_json(model, json, overwrite=false)
-        # TODO
-      end
-      
-      def self.import_xml(model, xml, overwrite=false)
-        # TODO
-      end
-      
-      def self.import_csv(model, csv, overwrite=false)
-        ::UzuUzu.transaction do |tr|
-          tr.begin
-          begin
-            resource = model.first(:id => csv[0])
-            csv.each_with_index do |culumn, index|
-              if resource.nil? || overwrite
-                resource ||= model.new
-                resource.properties.each_with_index do |property, column_no|
-                  resource[property.name] = culumn if index = column_no
-                end
-                resource.save
-              end
-            end
-            tr.commit
-          rescue => e
-            tr.rollback
-            raise e
-          end
-        end
-      end # import_csv
-    end # Fixture
-  end # DataStore
-end # UzuUzu

data/lib/uzuuzu/helper/uzuuzu.rb

@@ -1,48 +0,0 @@
-# coding: utf-8
-
-module UzuUzu
-  #
-  #
-  #
-  module Helper
-    #
-    #
-    #
-    module UzuUzuHelper
-    #
-    #
-    #
-    def logger
-      ::UzuUzu.logger
-    end
-
-    #
-    #
-    #
-    def memcache
-      ::UzuUzu.memcache
-    end
-    
-    #
-    #
-    #
-    def kvs
-      ::UzuUzu.kvs
-    end
-    
-    #
-    #
-    #
-    def datastore
-      ::UzuUzu.datastore
-    end
-    
-    #
-    #
-    #
-    def mailer
-      ::UzuUzu.mailer
-    end
-    end # UzuUzuHelper
-  end # Helper
-end # UzuUzu