ende 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0da97c41b5dc3465944322b1ece15ec3be43654c
-  data.tar.gz: a98863c9f0045fd41a98637525489715140fa862
+  metadata.gz: 857b7d175f476f673248c3c9a0ddee276913fa0e
+  data.tar.gz: 6d18ac351c4b2de2c4bda63c06a8ecfe24c3bb84
 SHA512:
-  metadata.gz: 044da7f2be4b59eafdcd02a44e7812408664e4e5fc72fe07e774cfed10e80157cde7bcdbc065300b92a29ab8fdc08d0a4f61e8f1ef2e02b6539a7812f2920002
-  data.tar.gz: f077995aab9837b6ab9ca75a69e9e7361bb6412febe1858e04b83da7b0506a6345b6ff67ac1c3f535eb6aed244790163d02f0800c5d838089bca7a96320b9003
+  metadata.gz: 2f3f412ed571b37ad797fe61210e1e743707ae4f91280736ba7e143953763176692c917b196fcd74c67fdfc0c55591133857b6c321f18ee3b52178b218d38f2c
+  data.tar.gz: b62a0062319c9b5de96e2e6bf9753a0e3307dc96dc437203da3418094b9a43be266fb93a1ff00a29936ce871942928fc018c04901f9be80bd93895fcf719c276

data/lib/assets/javascripts/widgets/viewer/main.js.coffee

@@ -129,7 +129,32 @@ define [
     viewed: (event, in_view, horizontal, vertical) ->
       boo[if in_view then 'pride' else 'shame'] event.target
 
-  version: '0.2.2'
+
+  # TODO Move each handler to independent features
+  handleable = stampit
+    handleables:
+      item:
+        hover: (event, models) ->
+          if event.type == 'mouseenter'
+            @hover models.item
+          else if event.type == 'mouseleave'
+            @hover null
+          else
+            throw new TypeError 'viewer.handlers.hover: Event type incompatible with hovering.'
+
+        clicked: (event, models) -> @select models.item
+
+  , {}, ->
+
+    throw new TypeError "Widget property is mandatory for handleable stamp" unless @widget?
+
+    @handlers =
+      item:
+        clicked: $.proxy @handleables.item.clicked, @widget
+        hover  : $.proxy @handleables.item.hover  , @widget
+
+    @
+  version: '0.2.4'
 
   # TODO better separation of concerns
   # TODO Current remote page that is beign displayed
@@ -213,7 +238,7 @@ define [
 
     # TODO store spinner instance, instead of creating a new one every time
     unless @load?
-      @load   = @sandbox.ui.loader @$el.find '.results .items'
+      @load   = @sandbox.ui.loader @$results
 
       # TODO implement status for viewer widget
       @statused 'loading'
@@ -260,10 +285,8 @@ define [
         @load = null
 
 
-  populate: (handlers) ->
-    sandbox = @sandbox
-
-    @load   = @sandbox.ui.loader @$results
+  populate: ->
+    @load   = @sandbox.ui.loader @$el
 
     # TODO implement status for viewer widget
     @statused 'loading'
@@ -291,9 +314,12 @@ define [
 
       @load.stop()
 
-      @presentation = @presenter records, @scope
+      # TODO do not send records as parameter
+      @presentation = @presenter records, @scope, @handleable
 
+      # Initialize elements
       @$el.html templates[@options.resource]
+      @$results = @$el.find '.results .items'
 
       if records.length
         # boo.initialize @$el.find '.results .items'
@@ -430,7 +456,12 @@ define [
   initialize: (options) ->
     # TODO import core extensions in another place
     @resource      = @sandbox.resource options.resource
-    @scope         = model = @resource
+    @scope         = @resource
+
+    # Instantiate it's on handleable factory
+    widget         = @
+    widgetable     = stampit().enclose -> @widget = widget; @
+    @handleable    = stampit.compose widgetable, handleable
 
     {sandbox: {util: {@inflector}}}   = @
 
@@ -459,30 +490,16 @@ define [
       "./widgets/viewer/presenters/#{resource}"
       ], (custom_default_template, custom_presenter) =>
 
-      # TODO Better way to preserve widgets handlers
-      # TODO Move each handler to independent features
-      handlers     =
-        item:
-          hover: (event, models) =>
-            if event.type == 'mouseenter'
-              @hover models.item
-            else if event.type == 'mouseleave'
-              @hover null
-            else
-              throw new TypeError 'viewer.handlers.hover: Event type incompatible with hovering.'
-
-          clicked: (event, models) =>
-            @select models.item
-
-      presenter.handlers = handlers
+      unless presenter.hasOwnProperty 'handlers'
+        Object.defineProperty presenter, 'handlers',
+          get: -> throw new Error "presenter.hanlder is deprecated, please compose upon handleable"
+          set: -> throw new Error "presenter.hanlder is deprecated, please compose upon handleable"
 
       custom_default_template and templates[resource] = custom_default_template
       @presenter  = @sandbox.util.extend custom_presenter, presenter if custom_presenter
 
-      @$results ||= @$el.find '.results .items'
-
       # Fetch default data
-      @populate handlers
+      @populate()
 
       deferred.resolveWith @, [resource]
 

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ende
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Heitor Salazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler