devlin 0.0.3 → 0.0.4

data/lib/devlin/base.rb

@@ -15,7 +15,7 @@ module Devlin
 
     def scope(name)
       @scope ||= {}
-      @scope[name.to_sym] ||= Scope.new(@params, &(self.class[name.to_sym]))
+      @scope[name.to_sym] ||= Scope.new(name, @params, &(self.class[name.to_sym]))
       @scope[name.to_sym]
     end
 

data/lib/devlin/column.rb

@@ -1,5 +1,7 @@
 module Devlin
   class Column
+    attr_reader :name, :config
+
     def initialize(name, config, *args)
       @name = name
       @config = config
@@ -22,6 +24,10 @@ module Devlin
       end
     end
 
+    def human_attribute_name
+      I18n.t(self.name, scope[:devlin, config[:scope].name])
+    end
+
     def arguments
       @arguments
     end

data/lib/devlin/query.rb

@@ -1,11 +1,12 @@
 module Devlin
   class Query
-    attr_reader :query, :scope
+    attr_reader :query, :scope, :scope_name
 
     def initialize(parent, q)
       @parent = parent
       @query = YAML.load(q)
       @scope = parent.scope(query['scope'])
+      @scope_name = query['scope']
       @select = query['select']
       @conditions = query['conditions']
       @group = query['group']

data/lib/devlin/scope.rb

@@ -20,9 +20,11 @@ module Devlin
     end
 
     attr_accessor :relation
+    attr_reader :name
 
-    def initialize(params, &block)
+    def initialize(name, params, &block)
       Config.new(self, params, &block)
+      @name = name
     end
 
     # add a column definition to the scope
@@ -30,7 +32,8 @@ module Devlin
       @columns ||= {}
       @columns[name.to_sym] = Column.new(name, {
         definition: definition,
-        getter: block
+        getter: block,
+        scope: self
       }, *args)
     end
 

data/lib/devlin/version.rb

@@ -1,3 +1,3 @@
 module Devlin
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devlin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: